Mercurial > hg > mercurial-talk

comparison rename-guessing.tex @ 363:7788b512c5bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Trim vendor branch slides
author Martin Geisler <mg@aragost.com>
date Fri, 22 Jun 2012 15:55:44 +0200
parents 6839cd949165
children
comparison
equal deleted inserted replaced
362:33add2a99379 363:7788b512c5bd
2 Mercurial can help you: 2 Mercurial can help you:
3 \begin{lstlisting} 3 \begin{lstlisting}
4 $ rm -r lib/libfoo 4 $ rm -r lib/libfoo
5 $ unzip libfoo-2.0.zip -d lib/libfoo 5 $ unzip libfoo-2.0.zip -d lib/libfoo
6 $ hg status 6 $ hg status
7 M lib/libfoo/modified.txt 7 M lib/libfoo/a.txt
8 ! lib/libfoo/deleted.txt 8 ! lib/libfoo/b.txt
9 ? lib/libfoo/new.txt 9 ? lib/libfoo/c.txt
10 \end{lstlisting} 10 \end{lstlisting}
11 11
12 \pause 12 \pause
13 13
14 Question: has \ext{deleted.txt} been renamed to \ext{new.txt}? 14 Question: has \ext{b.txt} been renamed to \ext{c.txt}?
15 \begin{lstlisting} 15 \begin{lstlisting}
16 $ hg addremove --similarity 90 16 $ hg addremove --similarity 90
17 removing deleted.txt 17 removing b.txt
18 adding new.txt 18 adding c.txt
19 recording removal of deleted.txt as rename to new.txt (94% similar) 19 recording removal of b.txt as rename to c.txt (94% similar)
20 \end{lstlisting} 20 \end{lstlisting}
21 \end{frame} 21 \end{frame}