Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-issue5958.t
branchstable
changeset 4998 88b816a9d990
parent 4997 e989d109ca9c
child 5013 18fe83bf7b14
child 5091 308c1e09f80f
equal deleted inserted replaced
4997:e989d109ca9c 4998:88b816a9d990 
    94   merge:[6] add foo.txt
 
    94   merge:[6] add foo.txt
 
    95   with: [4] add foo.txt
 
    95   with: [4] add foo.txt
 
    96   base: [1] add foo.txt
 
    96   base: [1] add foo.txt
 
    97   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    97   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    98   1 new orphan changesets
 
    98   1 new orphan changesets
 
    99   working directory is now at 2372e6d39855
 
    99   working directory is now at 459c64f7eaad
 
   100   $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   100   $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   101   4 c17bf400a278 1969-12-31 23:59 -0000: rewritten using evolve as 7:2372e6d39855
 
   101   4 c17bf400a278 1969-12-31 23:59 -0000: rewritten using evolve as 7:459c64f7eaad
 
   102   7 2372e6d39855 1970-01-01 00:00 +0000: 
   102   7 459c64f7eaad 1969-12-31 23:59 -0000: 
   103   7 bb2424887202 1969-12-31 23:59 +0000: (false !)
 
       
   104 
   103 
   105 date: updated one one side to an older value
 
   104 date: updated one one side to an older value
 
   106 
   105 
   107   $ hg evolve -r .
 
   106   $ hg evolve -r .
 
   108   move:[7] add foo.txt
 
   107   move:[7] add foo.txt
 
   109   atop:[0] add r0
 
   108   atop:[0] add r0
 
   110   working directory is now at 2b9788beff53
 
   109   working directory is now at 545776b4e79f
 
   111   $ hg update --hidden --rev 'predecessors(.)'
 
   110   $ hg update --hidden --rev 'predecessors(.)'
 
   112   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   111   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   113   updated to hidden changeset 2372e6d39855
 
   112   updated to hidden changeset 459c64f7eaad
 
   114   (hidden revision '2372e6d39855' was rewritten as: 2b9788beff53)
 
   113   (hidden revision '459c64f7eaad' was rewritten as: 545776b4e79f)
 
   115   working directory parent is obsolete! (2372e6d39855)
 
   114   working directory parent is obsolete! (459c64f7eaad)
 
   116   (use 'hg evolve' to update to its successor: 2b9788beff53)
 
   115   (use 'hg evolve' to update to its successor: 545776b4e79f)
 
   117   $ hg amend --date "0 2"
 
   116   $ hg amend --date "0 3"
 
   118   1 new orphan changesets
 
   117   1 new orphan changesets
 
   119   2 new content-divergent changesets
 
   118   2 new content-divergent changesets
 
   120   $ hg rebase -r . -d 0
 
   119   $ hg rebase -r . -d 0
 
   121   rebasing 9:88085147662e "add foo.txt" (tip)
 
   120   rebasing 9:c117f15338e6 "add foo.txt" (tip)
 
   122   $ hg log -G
 
   121   $ hg log -G
 
   123   @  changeset:   10:873d828420d8
 
   122   @  changeset:   10:7a09c7a39546
 
   124   |  tag:         tip
 
   123   |  tag:         tip
 
   125   |  parent:      0:a24ed8ad918c
 
   124   |  parent:      0:a24ed8ad918c
 
   126   |  user:        test
 
   125   |  user:        test
 
   127   |  date:        Wed Dec 31 23:59:58 1969 -0000
 
   126   |  date:        Wed Dec 31 23:59:57 1969 -0000
 
   128   |  instability: content-divergent
 
   127   |  instability: content-divergent
 
   129   |  summary:     add foo.txt
 
   128   |  summary:     add foo.txt
 
   130   |
 
   129   |
 
   131   | *  changeset:   8:2b9788beff53
 
   130   | *  changeset:   8:545776b4e79f
 
   132   |/   parent:      0:a24ed8ad918c
 
   131   |/   parent:      0:a24ed8ad918c
 
   133   |    user:        test
 
   132   |    user:        test
 
   134   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   133   |    date:        Wed Dec 31 23:59:58 1969 -0000
 
   135   |    instability: content-divergent
 
   134   |    instability: content-divergent
 
   136   |    summary:     add foo.txt
 
   135   |    summary:     add foo.txt
 
   137   |
 
   136   |
 
   138   o  changeset:   0:a24ed8ad918c
 
   137   o  changeset:   0:a24ed8ad918c
 
   139      user:        test
 
   138      user:        test
 
   140      date:        Thu Jan 01 00:00:00 1970 +0000
 
   139      date:        Thu Jan 01 00:00:00 1970 +0000
 
   141      summary:     add r0
 
   140      summary:     add r0
 
   142   
   141   
   143   $ hg evolve --list -r .
 
   142   $ hg evolve --list -r .
 
   144   873d828420d8: add foo.txt
 
   143   7a09c7a39546: add foo.txt
 
   145     content-divergent: 2b9788beff53 (draft) (precursor 2372e6d39855)
 
   144     content-divergent: 545776b4e79f (draft) (precursor 459c64f7eaad)
 
   146   
   145   
   147   $ hg log -r 2372e6d39855+873d828420d8+2b9788beff53 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   146   $ hg log -r 459c64f7eaad+7a09c7a39546+545776b4e79f --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   148   7 2372e6d39855 1970-01-01 00:00 +0000: date-changed using amend as 9:88085147662e; rebased using evolve as 8:2b9788beff53
 
   147   7 459c64f7eaad 1969-12-31 23:59 -0000: date-changed using amend as 9:c117f15338e6; rebased using evolve as 8:545776b4e79f
 
   149   10 873d828420d8 1969-12-31 23:59 -0000: 
   148   10 7a09c7a39546 1969-12-31 23:59 -0000: 
   150   8 2b9788beff53 1970-01-01 00:00 +0000: 
   149   8 545776b4e79f 1969-12-31 23:59 -0000: 
   151   $ hg evolve --content-divergent
 
   150   $ hg evolve --content-divergent
 
   152   merge:[8] add foo.txt
 
   151   merge:[8] add foo.txt
 
   153   with: [10] add foo.txt
 
   152   with: [10] add foo.txt
 
   154   base: [7] add foo.txt
 
   153   base: [7] add foo.txt
 
   155   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   154   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   156   working directory is now at bb2424887202
 
   155   working directory is now at 39c4200c0d94
 
   157   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   156   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   158   11 bb2424887202 1970-01-01 00:00 +0000: 
   157   11 39c4200c0d94 1969-12-31 23:59 -0000: 
   159   11 bb2424887202 1969-12-31 23:59 +0000: (false !)
 
       
   160 
   158 
   161 date: updated one side to an newer value
 
   159 date: updated one side to an newer value
 
   162 
   160 
   163   $ hg update --hidden --rev 'predecessors(.)'
 
   161   $ hg update --hidden --rev 'predecessors(.)'
 
   164   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   162   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   165   updated to hidden changeset 873d828420d8
 
   163   updated to hidden changeset 7a09c7a39546
 
   166   (hidden revision '873d828420d8' was rewritten as: bb2424887202)
 
   164   (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94)
 
   167   working directory parent is obsolete! (873d828420d8)
 
   165   working directory parent is obsolete! (7a09c7a39546)
 
   168   (use 'hg evolve' to update to its successor: bb2424887202)
 
   166   (use 'hg evolve' to update to its successor: 39c4200c0d94)
 
   169   $ hg amend --date "120 0"
 
   167   $ hg amend --date "120 0"
 
   170   2 new content-divergent changesets
 
   168   2 new content-divergent changesets
 
   171   $ hg log -G
 
   169   $ hg log -G
 
   172   @  changeset:   12:902e190ef559
 
   170   @  changeset:   12:da3be3d72fe2
 
   173   |  tag:         tip
 
   171   |  tag:         tip
 
   174   |  parent:      0:a24ed8ad918c
 
   172   |  parent:      0:a24ed8ad918c
 
   175   |  user:        test
 
   173   |  user:        test
 
   176   |  date:        Thu Jan 01 00:02:00 1970 +0000
 
   174   |  date:        Thu Jan 01 00:02:00 1970 +0000
 
   177   |  instability: content-divergent
 
   175   |  instability: content-divergent
 
   178   |  summary:     add foo.txt
 
   176   |  summary:     add foo.txt
 
   179   |
 
   177   |
 
   180   | *  changeset:   11:bb2424887202
 
   178   | *  changeset:   11:39c4200c0d94
 
   181   |/   parent:      0:a24ed8ad918c
 
   179   |/   parent:      0:a24ed8ad918c
 
   182   |    user:        test
 
   180   |    user:        test
 
   183   |    date:        Thu Jan 01 00:00:00 1970 +0000
 
   181   |    date:        Wed Dec 31 23:59:57 1969 -0000
 
   184   |    instability: content-divergent
 
   182   |    instability: content-divergent
 
   185   |    summary:     add foo.txt
 
   183   |    summary:     add foo.txt
 
   186   |
 
   184   |
 
   187   o  changeset:   0:a24ed8ad918c
 
   185   o  changeset:   0:a24ed8ad918c
 
   188      user:        test
 
   186      user:        test
 
   189      date:        Thu Jan 01 00:00:00 1970 +0000
 
   187      date:        Thu Jan 01 00:00:00 1970 +0000
 
   190      summary:     add r0
 
   188      summary:     add r0
 
   191   
   189   
   192   $ hg evolve --list -r .
 
   190   $ hg evolve --list -r .
 
   193   902e190ef559: add foo.txt
 
   191   da3be3d72fe2: add foo.txt
 
   194     content-divergent: bb2424887202 (draft) (precursor 873d828420d8)
 
   192     content-divergent: 39c4200c0d94 (draft) (precursor 7a09c7a39546)
 
   195   
   193   
   196   $ hg up bb2424887202
 
   194   $ hg up 39c4200c0d94
 
   197   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   195   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   198   $ hg log -r 873d828420d8+bb2424887202+902e190ef559 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   196   $ hg log -r 7a09c7a39546+39c4200c0d94+da3be3d72fe2 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   199   10 873d828420d8 1969-12-31 23:59 -0000: date-changed using evolve as 11:bb2424887202; date-changed using amend as 12:902e190ef559
 
   197   10 7a09c7a39546 1969-12-31 23:59 -0000: date-changed using amend as 12:da3be3d72fe2; rewritten using evolve as 11:39c4200c0d94
 
   200   11 bb2424887202 1970-01-01 00:00 +0000: 
   198   11 39c4200c0d94 1969-12-31 23:59 -0000: 
   201   12 902e190ef559 1970-01-01 00:02 +0000: 
   199   12 da3be3d72fe2 1970-01-01 00:02 +0000: 
   202   $ hg evolve --content-divergent
 
   200   $ hg evolve --content-divergent
 
   203   merge:[11] add foo.txt
 
   201   merge:[11] add foo.txt
 
   204   with: [12] add foo.txt
 
   202   with: [12] add foo.txt
 
   205   base: [10] add foo.txt
 
   203   base: [10] add foo.txt
 
   206   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   204   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   207   nothing changed
 
   205   working directory is now at 06cde6010a51
 
   208   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   206   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   209   11 bb2424887202 1970-01-01 00:00 +0000: 
   207   13 06cde6010a51 1970-01-01 00:02 +0000: 
   210   13 bb2424887202 1970-01-01 00:02 +0000: (false !)
 
       
   211 
   208 
   212 date: updated each side to a different value, newer should win
 
   209 date: updated each side to a different value, newer should win
 
   213 
   210 
   214   $ hg amend --date "235 0"
 
   211   $ hg amend --date "235 0"
 
   215   $ hg update --hidden --rev 'predecessors(.)'
 
   212   $ hg update --hidden --rev 'predecessors(.)'
 
   216   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   213   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   217   updated to hidden changeset bb2424887202
 
   214   updated to hidden changeset 06cde6010a51
 
   218   (hidden revision 'bb2424887202' was rewritten as: 48132e92d706)
 
   215   (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3)
 
   219   working directory parent is obsolete! (bb2424887202)
 
   216   working directory parent is obsolete! (06cde6010a51)
 
   220   (use 'hg evolve' to update to its successor: 48132e92d706)
 
   217   (use 'hg evolve' to update to its successor: a7412ff9bfb3)
 
   221   $ hg amend --date "784 0"
 
   218   $ hg amend --date "784 0"
 
   222   2 new content-divergent changesets
 
   219   2 new content-divergent changesets
 
   223   $ hg log -G
 
   220   $ hg log -G
 
   224   @  changeset:   14:694c3cf6b929
 
   221   @  changeset:   15:e3077936ec52
 
   225   |  tag:         tip
 
   222   |  tag:         tip
 
   226   |  parent:      0:a24ed8ad918c
 
   223   |  parent:      0:a24ed8ad918c
 
   227   |  user:        test
 
   224   |  user:        test
 
   228   |  date:        Thu Jan 01 00:13:04 1970 +0000
 
   225   |  date:        Thu Jan 01 00:13:04 1970 +0000
 
   229   |  instability: content-divergent
 
   226   |  instability: content-divergent
 
   230   |  summary:     add foo.txt
 
   227   |  summary:     add foo.txt
 
   231   |
 
   228   |
 
   232   | *  changeset:   13:48132e92d706
 
   229   | *  changeset:   14:a7412ff9bfb3
 
   233   |/   parent:      0:a24ed8ad918c
 
   230   |/   parent:      0:a24ed8ad918c
 
   234   |    user:        test
 
   231   |    user:        test
 
   235   |    date:        Thu Jan 01 00:03:55 1970 +0000
 
   232   |    date:        Thu Jan 01 00:03:55 1970 +0000
 
   236   |    instability: content-divergent
 
   233   |    instability: content-divergent
 
   237   |    summary:     add foo.txt
 
   234   |    summary:     add foo.txt
 
   240      user:        test
 
   237      user:        test
 
   241      date:        Thu Jan 01 00:00:00 1970 +0000
 
   238      date:        Thu Jan 01 00:00:00 1970 +0000
 
   242      summary:     add r0
 
   239      summary:     add r0
 
   243   
   240   
   244   $ hg evolve --list -r .
 
   241   $ hg evolve --list -r .
 
   245   694c3cf6b929: add foo.txt
 
   242   e3077936ec52: add foo.txt
 
   246     content-divergent: 48132e92d706 (draft) (precursor bb2424887202)
 
   243     content-divergent: a7412ff9bfb3 (draft) (precursor 06cde6010a51)
 
   247   
   244   
   248   $ hg log -r bb2424887202+48132e92d706+694c3cf6b929 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   245   $ hg log -r 39c4200c0d94+a7412ff9bfb3+e3077936ec52 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   249   11 bb2424887202 1970-01-01 00:00 +0000: date-changed using amend as 14:694c3cf6b929; date-changed using amend as 13:48132e92d706
 
   246   11 39c4200c0d94 1969-12-31 23:59 -0000: date-changed using evolve as 13:06cde6010a51
 
   250   13 48132e92d706 1970-01-01 00:03 +0000: 
   247   14 a7412ff9bfb3 1970-01-01 00:03 +0000: 
   251   14 694c3cf6b929 1970-01-01 00:13 +0000: 
   248   15 e3077936ec52 1970-01-01 00:13 +0000: 
   252   $ hg evolve --content-divergent
 
   249   $ hg evolve --content-divergent
 
   253   merge:[13] add foo.txt
 
   250   merge:[14] add foo.txt
 
   254   with: [14] add foo.txt
 
   251   with: [15] add foo.txt
 
   255   base: [12] add foo.txt
 
   252   base: [13] add foo.txt
 
   256   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   253   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   257   working directory is now at a24ed8ad918c
 
   254   working directory is now at 1a39f3901288
 
   258   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   255   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
 
   259   0 a24ed8ad918c 1970-01-01 00:00 +0000: 
   256   16 1a39f3901288 1970-01-01 00:13 +0000: 
   260   16 bb2424887202 1970-01-01 00:13 +0000: (false !)
evolve