On Fri, Dec 08, 2006 at 11:20:22AM -0800, Mike Kupfer wrote: > Danek> That certainly could be done. In fact, I think you could even > Danek> use mq to do that for you -- qimport each changeset since the > Danek> base, and then qfold all the patches. That might be easy enough > Danek> for people to remember even without wrapping it in its own > Danek> command. > > John> As Rich Lowe has pointed out to me a couple of times, merge > John> changesets are very tricky to deal with, though. > > I'm probably missing something, but can't we just throw away the merge > changesets? My understanding is that Mercurial can already distinguish > merge changesets from others (so that it can suppress them when you view > the log).
I believe the merge changeset also contains any conflict resolution you had to do. regards john _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org
