Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 788:64d2a558c943
add note about -C to update message
| author | mpm@selenic.com |
|---|---|
| date | Sat, 30 Jul 2005 08:30:12 -0800 |
| parents | 902b12d55751 |
| children | 8f5637f0a0c0 |
comparison
equal
deleted
inserted
replaced
| 787:f199e1887889 | 788:64d2a558c943 |
|---|---|
| 1490 for f in fl: | 1490 for f in fl: |
| 1491 cf = "" | 1491 cf = "" |
| 1492 if f in merge: cf = " (resolve)" | 1492 if f in merge: cf = " (resolve)" |
| 1493 self.ui.status(" %s%s\n" % (f, cf)) | 1493 self.ui.status(" %s%s\n" % (f, cf)) |
| 1494 self.ui.warn("aborting update spanning branches!\n") | 1494 self.ui.warn("aborting update spanning branches!\n") |
| 1495 self.ui.status("(use update -m to perform a branch merge)\n") | 1495 self.ui.status("(use update -m to merge across branches" + |
| 1496 " or -C to lose changes)\n") | |
| 1496 return 1 | 1497 return 1 |
| 1497 # we have to remember what files we needed to get/change | 1498 # we have to remember what files we needed to get/change |
| 1498 # because any file that's different from either one of its | 1499 # because any file that's different from either one of its |
| 1499 # parents must be in the changeset | 1500 # parents must be in the changeset |
| 1500 mode = 'm' | 1501 mode = 'm' |