>>>>> "Jamie" == Jamie Webb <[EMAIL PROTECTED]> writes:
Jamie> On Mon, Nov 07, 2005 at 03:34:17PM -0600, Richard A. Smith
Jamie> wrote:
>> What do you guys normally do for a patch name for your conflict
>> fixup patches?
Jamie> Personally, I'm lazy and call them all 'resolve conflicts',
Jamie> with no ill effects so far, but I can imagine that it would
Jamie> be more useful to have the name refer to the patches which
Jamie> conflicted.
Laziness is one mother of an invention. ;-)
What I do when I have the name of a conflicting patch handy (eg, in
the terminal output buffer) is to cut and paste and insert "Resolve
conflicts: " at the beginning of the new patch name.
When I have a patch name (eg, "Improve docstring") that is likely to
occur many times, I use the date as an heuristic uniquifier. Although
that often isn't "unique" it usually enough, and if I want more
uniqueness add the file or defun where the patch occured. I don't
know how well this would work for conflict resolutions; I always have
the name available in the terminal buffer so far.
Jamie> From a more technical point of view, amend-recording means
Jamie> that your patch becomes dependent on the other, which is
Jamie> fine for development in a single branch, however if there
Jamie> is the possibility that the patches might exist
Jamie> independently in different branches
This turns out to be a massive pain in the ass for me.
What I've done so far is to discipline myself so that files (NEWS,
TODO, ChangeLog) that often get changed in the same place (in all
three cases, prepend to file) are owned by one branch, and each branch
gets its own NEWS.$branch file. (Yes, I know that darcs makes the
ChangeLog obsolete. The project standards mandate a ChangeLog,
though.)
Jamie> And of course the best approach is to communicate with the
Jamie> rest of the team and avoid the conflicts in the first place
Jamie> :-).
I think that's arguable. What's the point of an advanced distributed
SCM if you're going to insist that people serialize their work to
avoid conflicts?
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
