[Svnmerge] Changes to svnmerge-blocked property are still shown even when using svnmerge.py avail -b
Steven Shanks
sshanks at valleyt.co.uk
Thu Oct 19 05:16:58 PDT 2006
Raman Gupta wrote:
> You blocked a trunk revision on the release branch. Now, if I read
> your message correctly, you are running "avail -b" on the trunk...
> shouldn't you be running "avail -b" on the release branch?
>
> If I misunderstood, then please post the commands you are using.
Sorry, let me make myself a bit clearer. The commands I am using are:
[release branch] svnmerge.py block -r 100
(revision blocked)
[release branch] svn commit
(new revision 101 committed)
[release branch] svnmerge.py avail -b
(returns nothing as expected)
[trunk] svnmerge.py avail -b
101
This revision (101) only contains the change to the svnmerge-blocked
property, and as far as I understand, this doesn't and shouldn't apply
to the trunk? So my natural reaction would be to try and block it,
which would lead to revision 102 being a possible merge for the branch,
and so on...
Cheers,
Steve
More information about the Svnmerge
mailing list