mergemaster annoyance or not?

[Daniel O'Connor]

On Thursday 12 March 2009 18:17:53 Doug Barton wrote:
> > I hope this issue will be resolved.
>
> What you're seeing is a mildly annoying side effect of how CVS works.
> There is nothing to resolve.

I wouldn't classify it as mildly annoying that you need to manually intervene 
in every single file..

Eugene's idea for the default diff options makes a lot of sense to me - I 
don't think any "normal" user gives a hoot about the CVS Id of a file.
(even devs!)

-- 
Daniel O'Connor software and network engineer
for Genesis Software - http://www.gsoft.com.au
"The nice thing about standards is that there
are so many of them to choose from."
  -- Andrew Tanenbaum
GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20090312/f1b91693/attachment.pgp