2010/1/12 Bob Archer <bob.archer_at_amsi.com>:
>> 2010/1/12 Bob Archer <bob.archer_at_amsi.com>:
>> >> > Well, reinterate can only be used if you have merged ALL of
>> trunk
>> >> into branch. You can't cherrypick stuff from trunk into branch
>> and
>> >> then --reintegrate the branch. It's not gonna allow it or work.
>> >> >
>> >> >
>> >> >> I am now at stage were "branch" should become the "new
>> trunk",
>> >> so I
>> >> >> thought I should use "reintegrate branch", i.e. from URL =
>> >> branch,
>> >> >> working copy = trunk, but this gives me an error "Error:
>> >> >> Reintegrate can
>> >> >> only be used if revisions 340 through 802 were previously
>> >> ...."
>> >> >> when I
>> >> >> do a "test merge".
>> >> >>
>> >> >
>> >> > If this is the result you want and you don't want to merge
>> >> everything from trunk to branch you can just delete the trunk
>> and
>> >> then copy the branch to trunk. This will get you where you want
>> to
>> >> be.
>> >> >
>> >> Copy how? Delete all in my trunk work copy, copy from branch
>> work
>> >> copy
>> >> to trunk work copy and commit - wouldn't that mess up SVN?
>> >
>> > Use the repository browser. Delete trunk. Then copy the branch to
>> trunk, then check out (or switch to) trunk. It won't mess up svn at
>> all.
>>
>> Err, why not just merge the branch back into trunk. Reintegrate is
>> a
>> not-very-complete feature so you still have to use the tree merge
>> in
>> many cases.
>>
>> http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-
>> merge.html#tsvn-dug-merge-tree
>>
>> Simon
>
> I assumed he couldn't do this, because not everything in trunk was merged into branch. So, there is stuff on trunk that he no longer wants. So, merging stuff in from branch is not going to remove the stuff that is in trunk that he doesn't want. Right?
Yes it will. Please read the doc section on merging two trees. If you
merge the diff from trunk to branch into trunk you end up with trunk
being identical to branch.
> Also, if he merges in from branch he looses all of the log history on branch, where as copying will retain that.. AFAIK.
AFAIK merge tracking will retain that information, although I am not
entirely sure.
Simon
--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2436857
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-12 22:23:01 CET