[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch to improve conflict output
From: |
Simon Liddington |
Subject: |
Patch to improve conflict output |
Date: |
Mon, 18 Jun 2001 12:25:44 +0100 (BST) |
When you get a conflict in a merge on update it is useful to know what the
original version was that the 2 new versions shown in the file were based
on. The patch provided makes cvs put the third version in as well.
example from sanity-sh branches-15:
A conflict marked like this
<<<<<<< file1
1:ancest
=======
1:brbr
>>>>>>> 1.1.2.1.2.1
becomes marked like this
<<<<<<< file1
1:ancest
||||||| 1.1.2.1
1:br1
=======
1:brbr
>>>>>>> 1.1.2.1.2.1
I could not see a simple way to make this a configurable option, so
unfortunately my patch means this behaviour is fixed.
Enjoy,
Simon
-----------------------------------------------------------------------
| Simon Liddington | Tel (home): +44 23 8023 7935 |
| sjl@zepler.org | Tel (work): +44 23 8068 3521 |
-----------------------------------------------------------------------
cvs-1.11p1-3way-conflict.patch
Description: Text document
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Patch to improve conflict output,
Simon Liddington <=