[Gnu-arch-users] NEW: three-way merges / conflict markers

[Tom Lord]

arch has traditionally indicated conflicts by generating .rej files
containing hunks that `patch(1)' rejects.

Sometimes people ask, instead, to have diff3 or CVS style conflict
markers left in the file being patched.   Like:

        <<<<<<< TREE
        this is what
        you had in your tree
        =======
        this is what the merged-from
        revision had instead
        >>>>>>> MERGED-FROM


With the head revision of tla--devo--1.1, you can get that style of
merge with:

        % tla star-merge -t  MERGED-FROM-REV

or 

        % tla star-merge --three-way  MERGED-FROM-REV


It's probably worth pointing out that `star-merge', especially with
the `-t' option, is an alternative to both `update' and `replay' for
catching up to changes in your default tree version.  In other words,
there isn't a real reason to add a `-t' option to `update' or `replay'
-- just use `star-merge' instead.  (On the other hand, I wouldn't
reject patches that turn `update -t' and `replay -t' into a call to
`star-merge'.)

(Note1: this feature adds a new option to ../configure.  Therefore, to 
compile it, you'll need to re-run ../configure.)

(Note2: regexps.srparish.net is still down.   These changes are
currently only in the quackerhead archive.)

(Note3: presumably this is between 90% and 100% of an enabler for
integration with fancy graphical merge tools.  If someone makes
progress in that area, lemme know what's missing (or even better,
whats-missing :-).)

-t

-----

https://www.paypal.com/xclick/business=lord%40emf.net&item_name=support+for+arch+and+other+free+software+efforts+by+tom+lord&no_note=1&tax=0&currency_code=USD

and

address@hidden for www.moneybookers.com payments.

"Fast forward a couple of years. Now the truly massive profit margins
 meant that just about any mistake and I mean any mistake, was completely
 masked by the awesome cash flow. Management succumbed to the cash flow
 drug and vainly assumed that it was their hard work, superior strategies
 and dizzying business acumen that was driving the company ever skyward.
 They thought they could do no wrong but they were. 

 They thought that t-shirts, purple furniture, jackets, unique building
 architecture, polo shirts, sabbaticals, watches and great product code
 names were the secret recipe for success." --Chad Carlin