Mercurial > hg > mercurial-crew-with-dirclash
view hg @ 992:f859e9cba1b9
Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
| author | mpm@selenic.com |
|---|---|
| date | Mon, 22 Aug 2005 01:22:29 -0700 |
| parents | 03f27b1381f9 |
| children | ad4a2eefe4d7 |
line wrap: on
line source
#!/usr/bin/env python # # mercurial - a minimal scalable distributed SCM # v0.6 "paola" # # Copyright 2005 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. from mercurial import commands commands.run()