Anonymous committed 1bc3452

Now check that the revisions to be collapsed are all from the correct user.

Comments (0)

Files changed (1)


     ui.debug(_('Collapsing revisions %s\n') % revs)
     for r in revs:
+        if repo[r].user() != ui.username() and not opts['force']:
+            raise util.Abort(_('revision %s does not belong to %s\n') %
+                (r, ui.username()))
         if r != last:
             children = repo[r].children()
             if len(children) > 1:
         ('r', 'rev', [], _('revisions to collapse')),
         ('', 'keep', False, _('keep original revisions')),
+        ('f', 'force', False, _('force collapse of changes from different users'))
         _('hg collapse -r REVS [--keep | --keepbranches]')),
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.