Mercurial > emacs
comparison lisp/vc-bzr.el @ 107005:fb234c5a45ed
Merge from trunk
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Thu, 07 Jan 2010 21:54:07 +0800 |
| parents | d94786c1fa6c |
| children | 95040dd9104b |
comparison
equal
deleted
inserted
replaced
| 107004:664aa528b94c | 107005:fb234c5a45ed |
|---|---|
| 669 ;; FIXME: what about ignored files? | 669 ;; FIXME: what about ignored files? |
| 670 (" D " . missing) | 670 (" D " . missing) |
| 671 ;; For conflicts, should we list the .THIS/.BASE/.OTHER? | 671 ;; For conflicts, should we list the .THIS/.BASE/.OTHER? |
| 672 ("C " . conflict) | 672 ("C " . conflict) |
| 673 ("? " . unregistered) | 673 ("? " . unregistered) |
| 674 ("? " . unregistered) | |
| 675 ;; No such state, but we need to distinguish this case. | 674 ;; No such state, but we need to distinguish this case. |
| 676 ("R " . renamed) | 675 ("R " . renamed) |
| 677 ;; For a non existent file FOO, the output is: | 676 ;; For a non existent file FOO, the output is: |
| 678 ;; bzr: ERROR: Path(s) do not exist: FOO | 677 ;; bzr: ERROR: Path(s) do not exist: FOO |
| 679 ("bzr" . not-found) | 678 ("bzr" . not-found) |
| 681 ;; working tree is out of date, run 'bzr update' | 680 ;; working tree is out of date, run 'bzr update' |
| 682 ;; ignore it. | 681 ;; ignore it. |
| 683 ;; FIXME: maybe this warning can be put in the vc-dir header... | 682 ;; FIXME: maybe this warning can be put in the vc-dir header... |
| 684 ("wor" . not-found) | 683 ("wor" . not-found) |
| 685 ;; Ignore "P " and "P." for pending patches. | 684 ;; Ignore "P " and "P." for pending patches. |
| 685 ("P " . not-found) | |
| 686 ("P. " . not-found) | |
| 686 )) | 687 )) |
| 687 (translated nil) | 688 (translated nil) |
| 688 (result nil)) | 689 (result nil)) |
| 689 (goto-char (point-min)) | 690 (goto-char (point-min)) |
| 690 (while (not (eobp)) | 691 (while (not (eobp)) |