Public Pastes
daily pastebin goal
52%
SHARE
TWEET

Untitled

a guest Jul 4th, 2010 56 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. exarkun@top:~/bzr-bug-reports$ cat bug3.script.txt
  2. bzr branch -r 1 safe-modules foo
  3. cd foo
  4. bzr merge -r 2..16 ../safe-modules
  5. exarkun@top:~/bzr-bug-reports$ bash bug3.script.txt
  6. Branched 1 revision(s).                                                                                                                                                
  7. +N  modules/                                                                                                                                                          
  8. +N  modules/__init__.py
  9. +N  modules/test/
  10. +N  modules/test/__init__.py
  11.  M  modules.py
  12.  M  test_modules.py
  13. Conflict adding files to modules.  Created directory.
  14. Conflict because modules is not versioned, but has versioned children.  Versioned directory.
  15. Conflict adding files to modules/test.  Created directory.
  16. Conflict because modules/test is not versioned, but has versioned children.  Versioned directory.
  17. 4 conflicts encountered.                                                                                                                                              
  18. exarkun@top:~/bzr-bug-reports$
RAW Paste Data
Top