Show More
@@ -1711,7 +1711,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1711 | modified, added, removed = [], [], [] |
|
1711 | modified, added, removed = [], [], [] | |
1712 | self._gitupdatestat() |
|
1712 | self._gitupdatestat() | |
1713 | if rev2: |
|
1713 | if rev2: | |
1714 | command = ['diff-tree', rev1, rev2] |
|
1714 | command = ['diff-tree', '-r', rev1, rev2] | |
1715 | else: |
|
1715 | else: | |
1716 | command = ['diff-index', rev1] |
|
1716 | command = ['diff-index', rev1] | |
1717 | out = self._gitcommand(command) |
|
1717 | out = self._gitcommand(command) |
@@ -1105,5 +1105,21 b' since we ignore the staging area' | |||||
1105 | ? s/c.c |
|
1105 | ? s/c.c | |
1106 | ? s/cpp.cpp |
|
1106 | ? s/cpp.cpp | |
1107 | ? s/foobar.orig |
|
1107 | ? s/foobar.orig | |
|
1108 | $ hg revert --all -q | |||
|
1109 | ||||
|
1110 | make sure we show changed files, rather than changed subtrees | |||
|
1111 | $ mkdir s/foo | |||
|
1112 | $ touch s/foo/bwuh | |||
|
1113 | $ hg add s/foo/bwuh | |||
|
1114 | $ hg commit -S -m "add bwuh" | |||
|
1115 | committing subrepository s | |||
|
1116 | $ hg status -S --change . | |||
|
1117 | M .hgsubstate | |||
|
1118 | A s/foo/bwuh | |||
|
1119 | ? s/barfoo | |||
|
1120 | ? s/c.c | |||
|
1121 | ? s/cpp.cpp | |||
|
1122 | ? s/foobar.orig | |||
|
1123 | ? s/snake.python.orig | |||
1108 |
|
1124 | |||
1109 | $ cd .. |
|
1125 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now