[Svnmerge] Missing available revisions

J.M. Maurer uwog at uwog.net
Fri Sep 21 14:24:12 PDT 2007


On Fri, 2007-09-21 at 23:02 +0200, J.M. Maurer wrote:
> Hey all,
> 
> I was looking into the usefulness of svnmerge.py to track patches that
> could be allowed to go in AbiWord's stable branch. While following the
> instructions on your site, I ran into a problem (probably it's just me
> being stupid though). 
> 
> This is what I did:
> 
> 1) copy http://svn.abisource.com/abiword/trunk/ to
>    http://svn.abisource.com/abiword/branches/ABI-2-6-0-STABLE/ 
> 
>    (this being revision 21985; Yay, AbiWord 2.6 is almost done)
> 
> 2) commit some changes in trunk (these being revisions 21990 to 21995)
> 
> 3) checkout the ABI-2-6-0-STABLE branch
> 
> 4) run "svnmerge.py init" in ABI-2-6-0-STABLE; this resulted in the
> following commit:
> 
> Initialized merge tracking via "svnmerge" with revisions "1-21985" from
> svn+ssh://svn.abisource.com/svnroot/abiword/trunk
> 
> 5) run "svnmerge.py avail"; this gives me "21990-21992".

Just figured it out

$  svnmerge.py avail -v
svnmerge: calculate source path for the branch
svnmerge: source is "svn+ssh://svn.abisource.com/svnroot/abiword/trunk"
svnmerge: skipping phantom revisions: 21986-21989,21993-21996
svnmerge: revisions available to be merged are:
21990-21992

Seeing those "phantom revisions", I notived the "missing commits' where on the abiword-plugins module, not the abiword module. Sorry for the noise, and thanks for the nice tool!

Marc


> Now I wonder why I can't see/select revisions 21993-21995. Anyone a clue
> what I'm doing wrong?
> 
> Thanks in advance,
>   Marc




More information about the Svnmerge mailing list