upstream/mercurial-mirror Commit - r2619:fc0ec2b6

1

# basic operation

1

# basic operation

2

adding a

2

adding a

3

reverting a

3

reverting a

4

changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57

4

changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57

5

a

5

a

6

# file that was removed is recreated

6

# file that was removed is recreated

7

adding a

7

adding a

8

adding a

8

adding a

9

changeset 2:44cd84c7349a backs out changeset 1:76862dcce372

9

changeset 2:44cd84c7349a backs out changeset 1:76862dcce372

10

content

10

content

11

# backout of backout is as if nothing happened

11

# backout of backout is as if nothing happened

12

removing a

12

removing a

13

changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a

13

changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a

14

cat: a: No such file or directory

14

cat: a: No such file or directory

15

# backout with merge

15

# backout with merge

16

adding a

16

adding a

17

reverting a

17

reverting a

18

changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23

18

changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23

19

merging with changeset 2:b66ea5b77abb

19

merging with changeset 2:b66ea5b77abb

20

merging a

20

merging a

21

0 files updated, 1 files merged, 0 files removed, 0 files unresolved

21

0 files updated, 1 files merged, 0 files removed, 0 files unresolved

22

(branch merge, don't forget to commit)

22

(branch merge, don't forget to commit)

23

line 1

23

line 1

24

# backout should not back out subsequent changesets

24

# backout should not back out subsequent changesets

25

adding a

25

adding a

26

adding b

26

adding b

27

reverting a

27

reverting a

28

changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5

28

changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5

29

the backout changeset is a new head - do not forget to merge

29

the backout changeset is a new head - do not forget to merge

30

(use "backout -m" if you want to auto-merge)

30

(use "backout -m" if you want to auto-merge)

31

b: No such file or directory

31

b: No such file or directory

32

adding a

33

adding b

34

adding c

35

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

36

adding d

37

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

38

(branch merge, don't forget to commit)

39

# backout of merge should fail

40

abort: cannot back out a merge changeset without --parent

41

# backout of merge with bad parent should fail

42

abort: cb9a9f314b8b is not a parent of b2f3bb92043e

43

# backout of non-merge with parent should fail

44

abort: cannot use --parent on non-merge changeset

45

# backout with valid parent should be ok

46

removing d

47

changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e

48

rolling back last transaction

49

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

50

removing c

51

changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             # basic operation
             adding a
             reverting a
             changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
             a
             # file that was removed is recreated
             adding a
             adding a
             changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
             content
             # backout of backout is as if nothing happened
             removing a
             changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
             cat: a: No such file or directory
             # backout with merge
             adding a
             reverting a
             changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
             merging with changeset 2:b66ea5b77abb
             merging a
 files updated, 1 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             line 1
             # backout should not back out subsequent changesets
             adding a
             adding b
             reverting a
             changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
             the backout changeset is a new head - do not forget to merge
             (use "backout -m" if you want to auto-merge)
             b: No such file or directory
+            adding a
+            adding b
+            adding c
+files updated, 0 files merged, 1 files removed, 0 files unresolved
+            adding d
+files updated, 0 files merged, 0 files removed, 0 files unresolved
+            (branch merge, don't forget to commit)
+            # backout of merge should fail
+            abort: cannot back out a merge changeset without --parent
+            # backout of merge with bad parent should fail
+            abort: cb9a9f314b8b is not a parent of b2f3bb92043e
+            # backout of non-merge with parent should fail
+            abort: cannot use --parent on non-merge changeset
+            # backout with valid parent should be ok
+            removing d
+            changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e
+            rolling back last transaction
+files updated, 0 files merged, 0 files removed, 0 files unresolved
+            removing c
+            changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e