[Svnmerge] [PATCH] Bidirectional merging patch for svnmerge.py

[Blair Zajac]

Alan Barrett wrote:
>>>>I'm also -1 on turning it on by default because most of the time
>>>>people don't care about the bidirectional functionality,
> 
> 
> I question that assumption.
> 
> With release branches, people usually merge in only one direction (from
> the trunk to the release branch).  But with feature branches, in my
> experience, people almost always merge in both directions: several
> merges from the trunk to the feature branch during development of the
> feature; once from the feature branch to the trunk just before the
> branch is abandoned; and possibly a few more times from the branch to
> the trunk if it makes sense to provide work in progress snapshots to the
> trunk.  I sometimes use parallel branches where changes are merged back
> and forth all the time.

That's my experience also.

>>>>and any slow down due to it will not be appreciated.
> 
> 
> Yes, I agree with that.  So I'd like the merge to work properly
> (bidirectional) in the default case, with an option for the unsafe but
> faster (unidirectional) method.

Agreed.

>>>Maybe we should introduce an svnmerge 'commit' command to take care of
>>>any follow up work to do.
>>
>>Hmmm, I don't like it simply because there is no guarantee the user will
>>actually run svnmerge.py commit instead of svn commit.
> 
> 
> I agree.
> 
> However, a "svnmerge.py merge-and-commit" command might make sense,
> possibly with an option to invoke an editor on the log message.

I do like to look over my merges before I commit, so I think this should be a 
two step process.

Regards,
Blair