Mercurial > hg
comparison tests/test-rebase-rename.t @ 13778:46c3043253fb
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Sun, 27 Mar 2011 13:34:20 +0200 |
parents | 6cc4b14fb76b |
children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
13777:f6e5035dc81a | 13778:46c3043253fb |
---|---|
117 2: 'copy A' | 117 2: 'copy A' |
118 diff --git a/a b/a-copied | 118 diff --git a/a b/a-copied |
119 copy from a | 119 copy from a |
120 copy to a-copied | 120 copy to a-copied |
121 | 121 |
122 $ cd .. | |
123 | |
124 | |
125 Test rebase across repeating renames: | |
126 | |
127 $ hg init repo | |
128 | |
129 $ cd repo | |
130 | |
131 $ echo testing > file1.txt | |
132 $ hg add file1.txt | |
133 $ hg ci -m "Adding file1" | |
134 | |
135 $ hg rename file1.txt file2.txt | |
136 $ hg ci -m "Rename file1 to file2" | |
137 | |
138 $ echo Unrelated change > unrelated.txt | |
139 $ hg add unrelated.txt | |
140 $ hg ci -m "Unrelated change" | |
141 | |
142 $ hg rename file2.txt file1.txt | |
143 $ hg ci -m "Rename file2 back to file1" | |
144 | |
145 $ hg update -r -2 | |
146 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
147 | |
148 $ echo Another unrelated change >> unrelated.txt | |
149 $ hg ci -m "Another unrelated change" | |
150 created new head | |
151 | |
152 $ hg tglog | |
153 @ 4: 'Another unrelated change' | |
154 | | |
155 | o 3: 'Rename file2 back to file1' | |
156 |/ | |
157 o 2: 'Unrelated change' | |
158 | | |
159 o 1: 'Rename file1 to file2' | |
160 | | |
161 o 0: 'Adding file1' | |
162 | |
163 | |
164 $ hg rebase -s 4 -d 3 | |
165 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) | |
166 | |
167 $ hg diff --stat -c . | |
168 unrelated.txt | 1 + | |
169 1 files changed, 1 insertions(+), 0 deletions(-) | |
170 |