RE: MERGE: Command Line Results Different from TortoiseSVN Results
From: Marcia Almeida Rocha <Marcia.Rocha_at_wedotechnologies.com>
Date: Thu, 15 Jan 2015 19:25:26 +0000
Hello
Below picture shows how we create the branches.
When 2.0 starts, the branch 1.0-work is created based on trunk , but some revisions from trunk are not already merged to branches/1.0. So they will merge later from 1.0-work to 1.0.
[cid:image004.png_at_01D030F9.015C23B0]
Best Regards
[WeDo Technologies]<http://www.wedotechnologies.com/>
Marcia Rocha –Tech Support Team
From: Ben Fritz [mailto:fritzophrenic_at_gmail.com]
On Thu, Jan 15, 2015 at 3:53 AM, Marcia Almeida Rocha <Marcia.Rocha_at_wedotechnologies.com<mailto:Marcia.Rocha_at_wedotechnologies.com>> wrote:
I think Gavin meant, "previous in the revision graph" not "previous in time".
Do these branches not share any ancestry, somehow? How did you create your branch?
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.