Talk:Svnmerge.py: Difference between revisions

From SubversionWiki
Jump to navigation Jump to search
← Older edit
Mla (talk | contribs)
3 edits
No edit summary
Mla (talk | contribs)
3 edits
No edit summary
 
Line 13: Line 13:


[[User:Tobu|Tobu]] 08:40, 30 March 2007 (PDT)
[[User:Tobu|Tobu]] 08:40, 30 March 2007 (PDT)
Can someone help me understand this error?
$ svnmerge.py integrated
svnmerge: unable to determine oldest revision for URL "svn+ssh://bantha/usr/local/svn/sandbox/trunk"
I can merge fine, but the integrated and rollback options always give me that error.
I've tried passing it various values for path but same problem. Any tips?

Latest revision as of 16:54, 2 May 2007

Hi, does this solve the bug in this merge + rename scenario:

  • branch /trunk into /branches/b1
  • rename /branches/b1/file into /branches/b1/file.renamed
  • edit /trunk/file
  • merge back /branches/b1 into /trunk

/trunk/file has been renamed into /trunk/file.renamed, but the changes done to /trunk/file have been lost.

See these descriptions:

Tobu 08:40, 30 March 2007 (PDT)

Retrieved from "https://www.orcaware.com/svn/mediawiki/index.php?title=Talk:Svnmerge.py&oldid=1610"