bazaar

Can bzr ignore empty lines when comparing revisions?

丶灬走出姿态 提交于 2019-12-13 02:50:00
问题 I would like to set up a bzr repository that does not require me to deal with the addition or subtraction of empty lines. Is it possible to do this? Are there any potential disadvantages? My code is in R and bash. 回答1: When comparing repositories or revisions using bzr diff, you can use diff-options to pass options through to the standard UNIX diff command. I've been unable to find a way to handle whitespace changes (tab to spaces, or spaces to tabs) gracefully. I've also been unable to find

How can a heavyweight checkout be changed to a lightweight checkout in Bazaar?

不羁的心 提交于 2019-12-12 11:28:21
问题 I have a shared repository like so: repo/ mainline featureA featureB I like to do all my development in one place, so I do something like > cd /Development/workingArea > bzr checkout featureA ... > bzr commit -m "Worked on featureA" > bzr switch featureB Over time, I've modified my feature branches to be treeless branches, as I found I was never interacting with those working trees. I would also like to change the checkout in /Development/workingArea so that it is a lightweight checkout, as

Is there a Bazaar equivalent to `git commit --amend`?

杀马特。学长 韩版系。学妹 提交于 2019-12-12 09:30:07
问题 I'm playing around with Launchpad projects using Bazaar and getting along fairly well. However, coming from a Git background I'm really missing the ability to roll changes into the last commit---this happens frequently when I discover a small, stupid typo that really doesn't deserve its own commit or entry in a debian/changelog file. Does Bazaar provide a command that serves the same purpose as git commit --amend ? 回答1: bzr uncommit + bzr commit but it does not populate your editor with old

Is it possible to do a partial clone/branch with either bazaar, mercurial or git?

╄→尐↘猪︶ㄣ 提交于 2019-12-12 07:45:11
问题 Suppose I have a project in source control with a lot of subdirectories, many of which I don't need at the moment. I would like to create a working copy containing only some of the entire tree, which still maintaining the ability to make changes, commit them, and push them back up. Is this possible and if so, how can I do it? I'm still deciding whether to go with bazaar or mercurial, so answers regarding either of those would be helpful. Edit: Actually, solutions for git would be useful too.

bzr: Detach a repository subdirectory into a new repo

China☆狼群 提交于 2019-12-12 01:18:55
问题 I have a bzr repository called misc . Naturally, it got clogged with lots of subdirectories which now deserve a repo of their own. How do I detach a subdirectory, say misc/docs , into a new repo called doc ? I have tried: bzr split misc/docs But got : bzr: ERROR: To use this feature you must upgrade your branch at file:///home/adam/bzr/misc/ to a format which supports rich roots. The repo is pushed into an external server, so I can delete and re-branch at will. Thanks, Adam 回答1: Take a look

convert from cvs to bzr

这一生的挚爱 提交于 2019-12-11 15:48:27
问题 cvsps-import doesn't support pserver bzr-fastimport doesn't support remote locations tailor is too hard bzrcvsserve isn't a conversion tool SourceForge is remote, uses pserve and many python bookmark projects (what I'm looking for) are in CVS... What now? 回答1: If your CVS repository hosted on SourceForge then you can download entire repo via rsync and then use bzr-fastimport with cvs2svn (cvs2bzr) tool. 回答2: You could import into a local temporary git repository and then import into Bazaar

DHIS2 - Eclipse Import Issue using Bazaar

我的未来我决定 提交于 2019-12-11 10:06:52
问题 After download the project using, bzr branch lp:~dhis2-devs-core/dhis2/2.18 I am getting the following error when trying to import DHIS2 project using Bazaar into Eclipse EE Luna Version 4.4.2: [Error 206] The filename or extension is too long: u 'D:/workspace/.metadata/.plugins/org.vcs.bazaar.eclipse.core/bzreclipse5417078662519156113.tmp/.bzr/checkout/limbo/new-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext/resources/themes/images/gray/form-invalid

Emacs — `start-process` for `bzr` does not output status to buffer

雨燕双飞 提交于 2019-12-11 09:06:36
问题 When running bzr in the native OSX Terminal.app, I see the status as follows: 32376kB 2kB/s / Build phase:Adding file contents 1282/3629 When running start-process , however, I see no status being output to the buffer. The process is functioning properly, just with no visible output until the end -- two (2) lines only: Created new stacked branch referring to bzr://bzr.savannah.gnu.org/emacs/trunk/. Process bzr-process finished Is there another listening function that Emacs offers that will

Monotonically increasing bazaar trunk revision numbers

扶醉桌前 提交于 2019-12-11 08:52:57
问题 I'm still figuring out how bazaar's revision numbering works. The workflow our team uses is basically: bzr branch lp:project/trunk # code,code,code bzr commit ... # code,code,code bzr commit ... bzr merge # resolve, resolve, resolve bzr push lp:project/trunk I'd prefer it if the trunk revision numbering was stable and increased monotonically with each push. However, as I understand it, whoever does bzr merge; bzr push lp:project/trunk ends up renumbering the revision history of the trunk to

Is keeping original timestamp useful in bazaar commit/pull/etc.?

独自空忆成欢 提交于 2019-12-11 08:04:15
问题 When using bzr pull , the timestamp of files becomes "now" (option 1), as opposed to keeping the original timestamp in the repo (option 2). Cons of option 1: Files which should be the same become different (even if only in the modification time). These differences may "propagate" across pulls/commits/etc. and they would contaminate the record of actual modification times of files in a package. Build systems (like make), which use the modification time of some files (prerequisites) to evaluate