Re: [PATCH] Merge source and target must be related but different branches, v1

2011-12-15 Thread Paul Burba
On Thu, Dec 15, 2011 at 10:15 AM, Paul Burba wrote: > On Thu, Dec 15, 2011 at 7:53 AM, Julian Foad > wrote: >> Thanks Paul. >> >> Paul Burba wrote: >> >>> Julian Foad wrote:  Here's a patch to reject silly merge attempts, which up to now give silly results.  This does not app

Re: [PATCH] Merge source and target must be related but different branches, v1

2011-12-15 Thread Paul Burba
On Thu, Dec 15, 2011 at 7:53 AM, Julian Foad wrote: > Thanks Paul. > > Paul Burba wrote: > >> Julian Foad wrote: >>>  Here's a patch to reject silly merge attempts, which up to now give >>> silly results. >>> >>>  This does not apply to all merges (general 2-URL and cherry-pick >>> merges), but th

Re: [PATCH] Merge source and target must be related but different branches, v1

2011-12-15 Thread C. Michael Pilato
On 12/15/2011 07:53 AM, Julian Foad wrote: > This "sync merge from my own history" operation seems bogus. I notice > that (without my patch) it merges changes from the future *and* records > mergeinfo > for them. Surely we didn't ever intend that? Subversion has supported "sync merge from my own

Re: [PATCH] Merge source and target must be related but different branches, v1

2011-12-15 Thread Julian Foad
Thanks Paul. Paul Burba wrote: > Julian Foad wrote: >> Here's a patch to reject silly merge attempts, which up to now give >> silly results. >> >> This does not apply to all merges (general 2-URL and cherry-pick >> merges), but the commonly used 'sync' and 'reintegrate' forms of >> merge on

Re: [PATCH] Merge source and target must be related but different branches, v1

2011-12-14 Thread Paul Burba
On Wed, Dec 14, 2011 at 8:18 AM, Julian Foad wrote: > Here's a patch to reject silly merge attempts, which up to now give silly > results. > > This does not apply to all merges (general 2-URL and cherry-pick merges), but > the commonly used 'sync' and 'reintegrate' forms of merge only make sense

[PATCH] Merge source and target must be related but different branches, v1

2011-12-14 Thread Julian Foad
Here's a patch to reject silly merge attempts, which up to now give silly results. This does not apply to all merges (general 2-URL and cherry-pick merges), but the commonly used 'sync' and 'reintegrate' forms of merge only make sense when the source and target 'branches' are related (have a c