[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[platform-cvs-dev] Bug 36436: [Merge] CVS substituted keywords treated as conflicts
- From: Axel MÃller <aegges@xxxxxx>
- Date: Mon, 5 Apr 2010 20:50:21 +0200
- Delivered-to: firstname.lastname@example.org
- User-agent: KMail/1.12.4 (Linux/2.6.31-21-generic; KDE/4.3.5; x86_64; ; )
I have submitted two patches to a address the problems mentioned in
The first patch adds the -kk option to the CVS merge command when the merge is
done without preview into the local workspace.
The second patch modifies the compare function in the Sync Preview so that CVS
keywords are ignored and thus do not create pseudo conflicts.
I would suggest to split the existing bug entry into two separate bugs. The
two patches that I have submitted are completely independent and provide fixes
for two that independent problems (well, the symptoms are identical but the
cause is different).
I would be happy if somebody could have a look at them. Any thoughts?