tags:

views:

41

answers:

1
Q: 

Forget a certain revision from the repository (BZR)

i have a bzr repository with revision number 701 and some time ago on revision number 680 i committed some code that changes every file in the repository (i.e. a source code formatter changes every file ) now i want to have the old formatting with out missing the changes i made after revision 680

how can i forget revision number 680 the one that changes every file

+2  A: 

1st way: bzr merge -r680..679, but you have to be ready to resolve many conflicts in the places where you made changes after re-formatting.

2nd way: use bzr rebase command from bzr-rewrite (former bzr-rebase) plugin.

bialix  2010-08-19 20:12:33
thank you,i have seen but i want some one sure ,you make it crystal clear Thank you,bialix
jspeshu  2010-08-20 05:56:21
one additional thing how can this be done if i want the only .THIS extensions from the source
jspeshu  2010-08-20 08:50:07
@jspeshu I don't understand your question about .THIS
bialix  2010-08-20 09:53:12
i mean when you do the forget command there will be conflicts on the files that were modified after the change so that will create 3 files for each conflicting files with extensions .THIS , .OTHER ,and .BASE so since i removed only a revision that only changes the formating => i only want the resolution to be made by taking files with .THIS extension
jspeshu  2010-08-23 05:55:50
@jspeshu if you're using bzr 2.2 then you can run the following command: `bzr resolve --take-this` see http://doc.bazaar.canonical.com/bzr.2.2/en/user-reference/resolve-help.html#resolve . In bzr 2.1 and earlier you should just copy foo.ext.THIS over foo.THIS and run `bzr resolve` after that.
bialix  2010-08-23 18:56:18
thank you .....
jspeshu  2010-08-24 11:12:35

related questions

What's the point of tags in bazaar?
Branching a subversion repository into a distributed CMS
What VCS allows me to add changes to multiple pending commits simultaneously?
Where does the Bazaar OS X installer put the executable?
How significant is the bazaar performance factor?
What are your coolest/most unusual hacks using a distributed version control system?
bazaar + cruise control
Using WinMerge with Bazaar
Is it worth the effort to create pretty revision history in a DVCS?
Do you have a clever hack to work around svn:externals not being supported in bzr-svn
Bazaar bound branch commit-and-update
bzr remove to delete a file with branch having uncommited changes
Bazaar: moving from single-developer to an accessible repository
examining history of deleted file
Does git have an equivalent for the bazaar automv plugin?
Development of a library in distributed version control system (bazaar)
Bazaar and $Id$
Bazaar (bzr) integration with Visual Studio
Should I look at version control systems beyond Subversion?
How do I disable Tortoise BZR?
What are the relative strengths and weaknesses of Git, Mercurial, and Bazaar?
How do I export the Bazaar history of a subfolder
Copying a directory that is version controlled
How do DVCSs (DRCSs) work?
How can I get a commit message from a bzr post-commit hook?