Leave out empty (pointless) commits during rebase

Bug #886542 reported by Kirill Müller
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-rewrite
Triaged
Medium
Unassigned

Bug Description

It would be nice if bzr-rewrite supported skipping empty revisions during rebase.

This will require a fair bit of refactoring though, as it means we can't plan the full rebase operation up front.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I don't think I follow, as far as I know after rebasing B' and C', you would end up with:

---A----A'
              \
               B'----C'

That's the way it works here at least.

Changed in bzr-rewrite:
status: New → Incomplete
Revision history for this message
Kirill Müller (krlmlr) wrote :

I have attached a shell script that hopefully shows what I mean. If you rebase C onto A', the branches B' and C' diverge.

Revision history for this message
Kirill Müller (krlmlr) wrote :

And, by the way:

bzr --version
Bazaar (bzr) 2.4.1
  Python interpreter: /usr/bin/python 2.7.2
  Python standard library: /usr/lib/python2.7
  Platform: Linux-3.0.0-12-generic-x86_64-with-Ubuntu-11.10-oneiric
  bzrlib: /usr/lib/python2.7/dist-packages/bzrlib
  Bazaar configuration: /home/XXX/.bazaar
  Bazaar log file: /home/XXX/.bzr.log

bzr plugins
bash_completion 2.4.1
  Generate a shell function for bash command line completion.

bzrtools 2.4.0
  Various useful commands for working with bzr.

changelog_merge 2.4.1
  Merge hook for GNU-format ChangeLog files

etckeeper
  Runs etckeeper pre-commit when necessary.

fastimport 0.11.0
  FastImport Plugin

launchpad 2.4.1
  Launchpad.net integration plugin for Bazaar.

netrc_credential_store 2.4.1
  Use ~/.netrc as a credential store for authentication.conf.

news_merge 2.4.1
  Merge hook for bzr's NEWS file.

qbzr 0.21.1
  QBzr - Qt-based frontend for Bazaar

rewrite 0.6.3dev
  Rebase support.

rewrite_interactive
  rewrite_interactive - rewrite some history

weave_fmt 2.4.1
  Weave formats.

Jelmer Vernooij (jelmer)
Changed in bzr-rewrite:
status: Incomplete → Triaged
description: updated
description: updated
Changed in bzr-rewrite:
importance: Undecided → Medium
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.