Guys,
Just want to make sure I'm getting this right.
I branched our main source tree a while back (almost a year ago now) and now it's time to get it all back together. The
other night I undertook a massive merge project: first I merged the trunk into the branch (which I had done a few times
before, and yes I was careful to make sure I only merged from where I had left off last time), and fixed any conflicts
there, and it all looked good. Then I merged the branch back into the trunk (which had obviously never been done), and
fixed any conflicts there, and it all looked good.
But I found that a certain directory, which had been created on the branch (i.e. never existed in the trunk) just got
lost from this entire process. Which is, OT1H, no big deal, because it's still checked into the branch and I can just
check it out again (which I did). But, OTOH, I can't seem to wrap my brain around what I need to do now to get this one
directory merged into the trunk.
Here's what the main dir and this one particular dir look like:
[kimahri:~/proj/Sphorb] svn info .
Path: .
URL: https://svn.thinkgeek-ffx.com/repos/Sphorb/trunk
Repository UUID: 3ca84cba-d7d3-0310-88c4-9f83cb22410d
Revision: 1196
Node Kind: directory
Schedule: normal
Last Changed Author: buddy
Last Changed Rev: 1172
Last Changed Date: 2005-08-09 18:57:53 -0400 (Tue, 09 Aug 2005)
Properties Last Updated: 2005-06-21 22:04:42 -0400 (Tue, 21 Jun 2005)
[kimahri:~/proj/Sphorb] svn info cgi-bin/checkout/
Path: cgi-bin/checkout
URL: https://svn.thinkgeek-ffx.com/repos/Sphorb/branches/new_checkout/cgi-bin/checkout
Repository UUID: 3ca84cba-d7d3-0310-88c4-9f83cb22410d
Revision: 1196
Node Kind: directory
Schedule: normal
Last Changed Author: buddy
Last Changed Rev: 1192
Last Changed Date: 2005-08-10 04:35:16 -0400 (Wed, 10 Aug 2005)
So, can anyone offer a hint as to what my svn merge command needs to look like in order to get this puppy put to bed? I
feel like 1192 (the last changed rev to the branch dir) is involved somehow, but I'm not entirely sure ...
TIA muchly.
-- Buddy
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 11 20:24:21 2005