Comment 5 for bug 557098
Revision history for this message
| John A Meinel (jameinel) wrote Re: [Bug 557098] Re: Merging the trunk into a branch causes spurious conflicts (CVS merges better than bzr) | #5 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Max Kanat-Alexander wrote:
> I had a chat with lifeless about this on #bzr, and actually, yes, you're
> right, from bzr's perspective, those are valid conflicts.
>
> So really, what I want is simply a better way to do what I'm trying to
> do. There actually isn't anything in bzr that does the same as "cvs up"
> would do--partly because CVS customizations are usually uncommitted, and
> bzr customizations are committed. Here's what I've told people to do for
> now:
>
> http://
>
Switch seems like it would be pretty close. (Change my underlying
revisions to match this other revision, but preserve my uncommitted
changes.)
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAku
eL0An3sNiUBQEdh
=AfeG
-----END PGP SIGNATURE-----