Questions tagged [bazaar]

Bazaar is a free distributed version control system (DVCS).

Bazaar is a free distributed version control system that helps you track project history over time and to collaborate easily with others. Whether you're a single developer, a co-located team or a community of developers scattered across the world, Bazaar scales and adapts to meet your needs. Part of the GNU Project, Bazaar is free software sponsored by Canonical.

Please report bugs to the bug tracker instead of posting them here on StackOverflow.

559 questions
2
votes
3 answers

"import site' failed; use -v for traceback" - mac os lion, python 2.7, subprocess

I'm trying to run a subprocess in python, this a part from my code: def update(self): currentTime = strftime("%d.%m.%y %H:%M", gmtime()) #strftime("%d-%m-%y %H:%M", gmtime) resultString = "======== " + currentTime + " ========\n\n" …
Ron D.
  • 3,774
  • 6
  • 31
  • 39
2
votes
4 answers

How to migrate from a complicated subversion repository to a distributed version control system?

Let's suppose we have a subversion repository which looks like /original/0.1 /original/0.2 /variantA/trunk /variantA/branches/who/branch_for_xxx /variantA/branches/she/branch_for_yyy /variantB/trunk /variantB/branches/who/branch_for_zzz (... 30 or…
yhirai
  • 131
  • 3
2
votes
1 answer

Bazaar: How to restart central repository from checkout

I set up an central repository on a remote server. I develop locally on my laptop using a checkout of the central repository. Last week the remote server died. I understand that I can unbind the local checkout and work locally, but how can I use my…
mclowe
  • 23
  • 2
2
votes
1 answer

Bazaar: Merge bubble in mainline after pull - merge - commit

I'm new to Bazaar, coming to it from a background of Subversion and git. I thought I had a working grasp of some basic concepts, but have already hit a stumbling block in my first major commit. The project is hosted on Launchpad. I created a local…
Jim Nelson
  • 1,688
  • 3
  • 15
  • 27
2
votes
5 answers

How find most recent tag for current revision in Git/HG/Bzr?

Currently in my practice I use VERSION file to store: major=2 minor=0 fix=1 which mean that sources for product version v2.0.1 or newer. Before each release I must commit update to this file so tag with name tag2.0.1 or release-2.0.1 cover above…
gavenkoa
  • 45,285
  • 19
  • 251
  • 303
2
votes
2 answers

How to tell Bazaar that a file is binary

This is to avoid having some <<< or some >>> in that file if there are conflicts. If there is a conflict, I just want a message telling me there is a conflict and bazaar should not mess with the file. With subversion, you can modify the…
Oli
  • 15,345
  • 8
  • 30
  • 36
2
votes
4 answers

Branching a subversion repository into a distributed CMS

I have a problem that I am not sure of the best way to tackle. I have been working on a project that requires me to go to China to do the install and integration. My code has been under subversion since the start, since that was what I knew and had…
Tanj
  • 1,354
  • 1
  • 15
  • 25
2
votes
2 answers

bzr merge - reviewing another branches commit notes ('merge tips') before committing

I have a developer who has made some changes, and has asked that I merge them in. In order to be safe, I haven't merged/committed his work outright, but instead made a copy of his branch so that I can do a 'bzr log --forward -n 0 -v | less' to see…
jbobbylopez
  • 257
  • 2
  • 6
  • 15
2
votes
3 answers

Should I use push or switch to create branch in bazaar?

To create a branch in bazaar, I can do two things: Checkout the trunck, do modifications, local commit and then push my version to MyProject/MyBranch or create MyProject/MyBranch and switch my checkout to the new branch, then do modification and…
TridenT
  • 4,879
  • 1
  • 32
  • 56
2
votes
2 answers

Launchpad commit messages

Is there any possibility to do some formatting of the commit messages from bazaar on launchpad? Something like what is in SVN+Redmine, e.g. using asterisks (*) and newlines to make lists or referencing or marking bugs fixed (like "fixes #866" and…
zegkljan
  • 8,051
  • 5
  • 34
  • 49
2
votes
1 answer

Where does the Bazaar OS X installer put the executable?

I recently installed Bazaar on my Mac laptop and I'm trying to get bzreclipse working. In order to do that, I need to tell it where the bzr executable is. I can't figure out where the installer put it. Anyone know what the default location is for…
Chris Upchurch
  • 15,297
  • 6
  • 51
  • 66
2
votes
1 answer

Bazaar with .sln and .csproj files

First, let me try to describe how I've got my Bazaar project organized, it's something like this: Library Project Trunk Developer one Developer two Application Project 1 Trunk Developer one Developer two Application Project 2 Trunk Developer…
Eric
  • 1,392
  • 17
  • 37
2
votes
2 answers

Bazaar: Automatic file modification on commit with the modification committed

I would like bazaar to write revision number on commit to a file in the committed branch so that this modification is included in the commit. I looked at hooks but the pre_commit hook is only run after the changeset is created, thus the…
jvm
  • 349
  • 1
  • 3
  • 7
2
votes
1 answer

fast-import/fast-export git/bzr: what is the importance of the marks files to history integrity?

I'm currently using git-bzr-ng to import a number of branches from a bzr repository and I've discovered that if you use different target branches for each imported branch the tool does not use the same import and export marks files. Some reading of…
dbailey
  • 1,417
  • 1
  • 10
  • 16
2
votes
1 answer

How to properly merge two bzr branches?

I work with two branches of the same project. Both of them were created by me many months ago. I am the only developer of this project. I return to this project after a long period of neglect. My original intent (as far as I remember what I had on…
Boris Gorelik
  • 29,945
  • 39
  • 128
  • 170