upstream/mercurial-mirror Commit - r29680:2f034a21

1

https://bz.mercurial-scm.org/1175

1

https://bz.mercurial-scm.org/1175

2

3

$ hg init

3

$ hg init

4

$ touch a

4

$ touch a

5

$ hg ci -Am0

5

$ hg ci -Am0

6

adding a

6

adding a

7

8

$ hg mv a a1

8

$ hg mv a a1

9

$ hg ci -m1

9

$ hg ci -m1

10

11

$ hg co 0

11

$ hg co 0

12

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

12

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

13

14

$ hg mv a a2

14

$ hg mv a a2

15

$ hg up

15

$ hg up

16

note: possible conflict - a was renamed multiple times to:

16

note: possible conflict - a was renamed multiple times to:

17

a2

17

a2

18

a1

18

a1

19

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

19

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

20

21

$ hg ci -m2

21

$ hg ci -m2

22

23

$ touch a

23

$ touch a

24

$ hg ci -Am3

24

$ hg ci -Am3

25

adding a

25

adding a

26

27

$ hg mv a b

27

$ hg mv a b

28

$ hg ci -Am4 a

28

$ hg ci -Am4 a

29

30

$ hg ci --debug --traceback -Am5 b

30

$ hg ci --debug --traceback -Am5 b

31

committing files:

31

committing files:

32

b

32

b

33

warning: can't find ancestor for 'b' copied from 'a'!

33

warning: can't find ancestor for 'b' copied from 'a'!

34

committing manifest

34

committing manifest

35

committing changelog

35

committing changelog

36

committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1

36

committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1

37

38

$ hg verify

38

$ hg verify

39

checking changesets

39

checking changesets

40

checking manifests

40

checking manifests

41

crosschecking files in changesets and manifests

41

crosschecking files in changesets and manifests

42

checking files

42

checking files

43

4 files, 6 changesets, 4 total revisions

43

4 files, 6 changesets, 4 total revisions

44

45

$ hg export --git tip

45

$ hg export --git tip

46

# HG changeset patch

46

# HG changeset patch

47

# User test

47

# User test

48

# Date 0 0

48

# Date 0 0

49

# Thu Jan 01 00:00:00 1970 +0000

49

# Thu Jan 01 00:00:00 1970 +0000

50

# Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1

50

# Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1

51

# Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f

51

# Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f

52

5

52

5

53

54

diff --git a/b b/b

54

diff --git a/b b/b

55

new file mode 100644

55

new file mode 100644

56

57

http://bz.~~selenic.com~~/show_bug.cgi?id=4476

57

https://bz.mercurial-scm.org/show_bug.cgi?id=4476

58

59

$ hg init foo

59

$ hg init foo

60

$ cd foo

60

$ cd foo

61

$ touch a && hg ci -Aqm a

61

$ touch a && hg ci -Aqm a

62

$ hg mv a b

62

$ hg mv a b

63

$ echo b1 >> b

63

$ echo b1 >> b

64

$ hg ci -Aqm b1

64

$ hg ci -Aqm b1

65

$ hg up 0

65

$ hg up 0

66

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

66

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

67

$ hg mv a b

67

$ hg mv a b

68

$ echo b2 >> b

68

$ echo b2 >> b

69

$ hg ci -Aqm b2

69

$ hg ci -Aqm b2

70

$ hg graft 1

70

$ hg graft 1

71

grafting 1:5974126fad84 "b1"

71

grafting 1:5974126fad84 "b1"

72

merging b

72

merging b

73

warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

73

warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

74

abort: unresolved conflicts, can't continue

74

abort: unresolved conflicts, can't continue

75

(use 'hg resolve' and 'hg graft --continue')

75

(use 'hg resolve' and 'hg graft --continue')

76

[255]

76

[255]

77

$ echo a > b

77

$ echo a > b

78

$ echo b3 >> b

78

$ echo b3 >> b

79

$ hg resolve --mark b

79

$ hg resolve --mark b

80

(no more unresolved files)

80

(no more unresolved files)

81

continue: hg graft --continue

81

continue: hg graft --continue

82

$ hg graft --continue

82

$ hg graft --continue

83

grafting 1:5974126fad84 "b1"

83

grafting 1:5974126fad84 "b1"

84

warning: can't find ancestor for 'b' copied from 'a'!

84

warning: can't find ancestor for 'b' copied from 'a'!

85

$ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n'

85

$ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n'

86

changeset: 3:376d30ccffc0

86

changeset: 3:376d30ccffc0

87

summary: b1

87

summary: b1

88

89

changeset: 2:416baaa2e5e4

89

changeset: 2:416baaa2e5e4

90

summary: b2

90

summary: b2

91

92

changeset: 0:3903775176ed

92

changeset: 0:3903775176ed

93

summary: a

93

summary: a

94

95

96

	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

             https://bz.mercurial-scm.org/1175
               $ hg init
               $ touch a
               $ hg ci -Am0
               adding a
               $ hg mv a a1
               $ hg ci -m1
               $ hg co 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg mv a a2
               $ hg up
               note: possible conflict - a was renamed multiple times to:
                a2
                a1
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg ci -m2
               $ touch a
               $ hg ci -Am3
               adding a
               $ hg mv a b
               $ hg ci -Am4 a
               $ hg ci --debug --traceback -Am5 b
               committing files:
               b
               warning: can't find ancestor for 'b' copied from 'a'!
               committing manifest
               committing changelog
               committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1
               $ hg verify
               checking changesets
               checking manifests
               crosschecking files in changesets and manifests
               checking files
 files, 6 changesets, 4 total revisions
               $ hg export --git tip
               # HG changeset patch
               # User test
               # Date 0 0
               #      Thu Jan 01 00:00:00 1970 +0000
               # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1
               # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f
               diff --git a/b b/b
               new file mode 100644
-            http://bz.selenic.com/show_bug.cgi?id=4476
+            https://bz.mercurial-scm.org/show_bug.cgi?id=4476
               $ hg init foo
               $ cd foo
               $ touch a && hg ci -Aqm a
               $ hg mv a b
               $ echo b1 >> b
               $ hg ci -Aqm b1
               $ hg up 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg mv a b
               $ echo b2 >> b
               $ hg ci -Aqm b2
               $ hg graft 1
               grafting 1:5974126fad84 "b1"
               merging b
               warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
               abort: unresolved conflicts, can't continue
               (use 'hg resolve' and 'hg graft --continue')
               [255]
               $ echo a > b
               $ echo b3 >> b
               $ hg resolve --mark b
               (no more unresolved files)
               continue: hg graft --continue
               $ hg graft --continue
               grafting 1:5974126fad84 "b1"
               warning: can't find ancestor for 'b' copied from 'a'!
               $ hg log -f b -T 'changeset:   {rev}:{node|short}\nsummary:     {desc}\n\n'
               changeset:   3:376d30ccffc0
               summary:     b1
               changeset:   2:416baaa2e5e4
               summary:     b2
               changeset:   0:3903775176ed
               summary:     a