Mercurial > hg-stable

comparison mercurial/copies.py @ 16177:b8c1a8a57540

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: fix mergecopies doc mapping direction
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Feb 2012 15:51:56 -0600
parents c12d4aceba79
children 828fe2ca7cbb
comparison
equal deleted inserted replaced
16176:0bb0b9f22cd7 16177:b8c1a8a57540
179 Find moves and copies between context c1 and c2 that are relevant 179 Find moves and copies between context c1 and c2 that are relevant
180 for merging. 180 for merging.
181 181
182 Returns two dicts, "copy" and "diverge". 182 Returns two dicts, "copy" and "diverge".
183 183
184 "copy" is a mapping from source name -> destination name, 184 "copy" is a mapping from destination name -> source name,
185 where source is in c1 and destination is in c2 or vice-versa. 185 where source is in c1 and destination is in c2 or vice-versa.
186 186
187 "diverge" is a mapping of source name -> list of destination names 187 "diverge" is a mapping of source name -> list of destination names
188 for divergent renames. 188 for divergent renames.
189 """ 189 """