Show More
@@ -665,6 +665,7 b' def commit(ui, repo, *pats, **opts):' | |||||
665 |
|
665 | |||
666 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
666 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
667 | if not node: |
|
667 | if not node: | |
|
668 | ui.status(_("nothing changed\n")) | |||
668 | return |
|
669 | return | |
669 | cl = repo.changelog |
|
670 | cl = repo.changelog | |
670 | rev = cl.rev(node) |
|
671 | rev = cl.rev(node) |
@@ -860,7 +860,6 b' class localrepository(repo.repository):' | |||||
860 | if (not force and not extra.get("close") and p2 == nullid |
|
860 | if (not force and not extra.get("close") and p2 == nullid | |
861 | and not (changes[0] or changes[1] or changes[2]) |
|
861 | and not (changes[0] or changes[1] or changes[2]) | |
862 | and self[None].branch() == self['.'].branch()): |
|
862 | and self[None].branch() == self['.'].branch()): | |
863 | self.ui.status(_("nothing changed\n")) |
|
|||
864 | return None |
|
863 | return None | |
865 |
|
864 | |||
866 | ms = merge_.mergestate(self) |
|
865 | ms = merge_.mergestate(self) |
@@ -9,4 +9,3 b' updating working directory' | |||||
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | applying ../a.diff |
|
10 | applying ../a.diff | |
11 | Using custom patch |
|
11 | Using custom patch | |
12 | nothing changed |
|
@@ -6,7 +6,6 b' applying p1.patch' | |||||
6 |
|
6 | |||
7 | % Rebase |
|
7 | % Rebase | |
8 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
9 | nothing changed |
|
|||
10 | saving bundle to |
|
9 | saving bundle to | |
11 | adding branch |
|
10 | adding branch | |
12 | adding changesets |
|
11 | adding changesets |
@@ -52,7 +52,6 b' o | 2: D' | |||||
52 | o 0: A |
|
52 | o 0: A | |
53 |
|
53 | |||
54 | % C onto F - skip of E |
|
54 | % C onto F - skip of E | |
55 | nothing changed |
|
|||
56 | saving bundle to |
|
55 | saving bundle to | |
57 | adding branch |
|
56 | adding branch | |
58 | adding changesets |
|
57 | adding changesets | |
@@ -71,7 +70,6 b' o 2: D' | |||||
71 | o 0: A |
|
70 | o 0: A | |
72 |
|
71 | |||
73 | % D onto C - rebase of a branching point (skip E) |
|
72 | % D onto C - rebase of a branching point (skip E) | |
74 | nothing changed |
|
|||
75 | saving bundle to |
|
73 | saving bundle to | |
76 | adding branch |
|
74 | adding branch | |
77 | adding changesets |
|
75 | adding changesets |
@@ -3,13 +3,11 b' adding a' | |||||
3 | % add first sub |
|
3 | % add first sub | |
4 | adding a |
|
4 | adding a | |
5 | committing subrepository s |
|
5 | committing subrepository s | |
6 | nothing changed |
|
|||
7 | % add sub sub |
|
6 | % add sub sub | |
8 | committing subrepository s |
|
7 | committing subrepository s | |
9 | committing subrepository ss |
|
8 | committing subrepository ss | |
10 | % bump sub rev |
|
9 | % bump sub rev | |
11 | committing subrepository s |
|
10 | committing subrepository s | |
12 | nothing changed |
|
|||
13 | % leave sub dirty |
|
11 | % leave sub dirty | |
14 | committing subrepository s |
|
12 | committing subrepository s | |
15 | changeset: 3:1c833a7a9e3a |
|
13 | changeset: 3:1c833a7a9e3a |
General Comments 0
You need to be logged in to leave comments.
Login now