Well, as you can see in my post, I did exactly what you said, and I got
nothing. Any idea?
Amir Kolsky
XP& Software
]-----Original Message-----
]From: SteveKing [mailto:steveking@gmx.ch]
]Sent: Wednesday, July 21, 2004 8:15 PM
]To: dev@tortoisesvn.tigris.org
]Subject: Re: [TSVN] How to merge?
]
]Amir Kolsky wrote:
]
]> I have tried to use the tortoise merge to no avail.
]>
]> I have X/trunk/foo (/bar, /beer) at revision 10 I branch to
]> X/branches/yofi/foo at 11 trunk progresses to 99 branch/yofi
]> progresses to 100
]>
]> I now want to merge the 'foo/bar' branch back to the trunk.
]>
]> I know that theoretically I need to
]>
]> svn merge -r11:head X/branches/yofi/foo/bar X/trunk/foo/bar
]>
]> the merge will take the delta between r11 to head on the foo/bar
]> branch and merge the changes with the trunk.
]>
]> both are working copies...
]>
]> How do I do this with Tortoise? Where do I have to be when I click?
]> trunk/foo/bar?
]> What do I put in the branch field? branch/yofi/foo/bar?
]> What do I put in the [from & to]? [11 & head]?
]
]Right-click on X/trunk/foo/bar, choose "merge" from the
]context menu the "from" URL/Path would be:
]X/branches/yofi/foo/bar, revision 11 the "to" URL/Path would
]be: X/branches/yofi/foo/bar, HEAD revision
]
]Reading _our_ docs sometimes helps too, not just the subversion docs ;)
]
]Stefan
]
]
]---------------------------------------------------------------------
]To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
]For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jul 21 22:18:27 2004