Re: Mercurial: automatically merge ChangeLogs
Jerry James <james(a)xemacs.org> writes:
On Wed, Jun 10, 2009 at 9:40 AM, Michael
Sperber<sperber(a)deinprogramm.de> wrote:
> setting HGMERGE to just "merge" (or doing the equivalent thing in .hgrc)
> gives you behavior that's pretty much identical to what CVS did. (Like
> Stephen, I never saw CVS automatically resolving ChangeLog conflicts.)
Oops, I lied. Well, it was unintentional, so maybe it was only a
slightly truth-challenged story.
I've been using Ben Wing's perl scripts for interacting with CVS for
so long that I forgot to mention that they are part of my workflow.
His cvs-update script automatically merges ChangeLogs. That's what I
want: some script I can run that will update my repository and
automatically merge ChangeLogs. I'll have to see if I can port his
scripts to mercurial. Not that I know much of anything about
mercurial....
If you can make it act like the Unix merge command, things should be
trivial from there.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta