merging branch to HEAD when branch contains partly trunk changes already

2005-07-08 Thread HK
Suppose the following situation. +-1.25.2 .. -- 1.25.2.2 -- 1.25.2.5 | ^ | |merge in 1.25 -- ... -- 1.27 -- ... -- 1.31 At 1.25 I created a branch. Later I merged the changes between 1.25 and 1.27 into the branch at 1.25.2.2 to have minor updates of the main trunk

Re: merging branch to HEAD when branch contains partly trunk changes already

2005-07-08 Thread Russ Sherk
Herald, On 8 Jul 2005 03:46:00 -0700, HK [EMAIL PROTECTED] wrote: Suppose the following situation. +-1.25.2 .. -- 1.25.2.2 -- 1.25.2.5 | ^ | |merge in 1.25 -- ... -- 1.27 -- ... -- 1.31 At 1.25 I created a branch. Later I merged the changes between 1.25

Re: merging branch to HEAD when branch contains partly trunk changes already

2005-07-08 Thread Pierre Asselin
HK [EMAIL PROTECTED] wrote: Suppose the following situation. +-1.25.2 .. -- 1.25.2.2 -- 1.25.2.5 | ^ | |merge in 1.25 -- ... -- 1.27 -- ... -- 1.31 At 1.25 I created a branch. Later I merged the changes between 1.25 and 1.27 into the branch at 1.25.2.2 to