https://www.orcaware.com/svn/mediawiki/api.php?action=feedcontributions&feedformat=atom&user=Mla 2026-04-22T11:34:37Z User contributions MediaWiki 1.45.3 https://www.orcaware.com/svn/mediawiki/index.php?title=Talk:Svnmerge.py&diff=1610 2007-05-03T00:54:04Z

<p>Mla: </p> <hr /> <div>Hi, does this solve the bug in this merge + rename scenario:<br /> <br /> * branch /trunk into /branches/b1<br /> * rename /branches/b1/file into /branches/b1/file.renamed<br /> * edit /trunk/file<br /> * merge back /branches/b1 into /trunk<br /> <br /> /trunk/file has been renamed into /trunk/file.renamed, but the changes done to /trunk/file have been lost.<br /> <br /> See these descriptions:<br /> * http://subversion.tigris.org/issues/show_bug.cgi?id=2685<br /> * http://svn.collab.net/repos/svn/trunk/www/merge-tracking/requirements.html#rename-tracking<br /> <br /> [[User:Tobu|Tobu]] 08:40, 30 March 2007 (PDT)</div>

Mla https://www.orcaware.com/svn/mediawiki/index.php?title=Talk:Svnmerge.py&diff=1609 2007-05-03T00:51:35Z

<p>Mla: </p> <hr /> <div>Hi, does this solve the bug in this merge + rename scenario:<br /> <br /> * branch /trunk into /branches/b1<br /> * rename /branches/b1/file into /branches/b1/file.renamed<br /> * edit /trunk/file<br /> * merge back /branches/b1 into /trunk<br /> <br /> /trunk/file has been renamed into /trunk/file.renamed, but the changes done to /trunk/file have been lost.<br /> <br /> See these descriptions:<br /> * http://subversion.tigris.org/issues/show_bug.cgi?id=2685<br /> * http://svn.collab.net/repos/svn/trunk/www/merge-tracking/requirements.html#rename-tracking<br /> <br /> [[User:Tobu|Tobu]] 08:40, 30 March 2007 (PDT)<br /> <br /> Can someone help me understand this error?<br /> <br /> $ svnmerge.py integrated<br /> svnmerge: unable to determine oldest revision for URL &quot;svn+ssh://bantha/usr/local/svn/sandbox/trunk&quot;<br /> <br /> I can merge fine, but the integrated and rollback options always give me that error.<br /> I've tried passing it various values for path but same problem. Any tips?</div>

Mla https://www.orcaware.com/svn/mediawiki/index.php?title=Talk:Svnmerge.py&diff=1608 2007-05-03T00:51:09Z

<p>Mla: </p> <hr /> <div>Hi, does this solve the bug in this merge + rename scenario:<br /> <br /> * branch /trunk into /branches/b1<br /> * rename /branches/b1/file into /branches/b1/file.renamed<br /> * edit /trunk/file<br /> * merge back /branches/b1 into /trunk<br /> <br /> /trunk/file has been renamed into /trunk/file.renamed, but the changes done to /trunk/file have been lost.<br /> <br /> See these descriptions:<br /> * http://subversion.tigris.org/issues/show_bug.cgi?id=2685<br /> * http://svn.collab.net/repos/svn/trunk/www/merge-tracking/requirements.html#rename-tracking<br /> <br /> [[User:Tobu|Tobu]] 08:40, 30 March 2007 (PDT)<br /> <br /> Can someone help me understand this error?<br /> <br /> $ svnmerge.py integrated<br /> svnmerge: unable to determine oldest revision for URL &quot;svn+ssh://bantha/usr/local/svn/sandbox/trunk&quot;<br /> <br /> I can merge fine, but the integrated and rollback options always give me that error.<br /> I've tried passing it various values for path but same problem. Any tips?</div>

Mla