/srv/irclogs.ubuntu.com/2008/05/11/#bzr.txt

Tsmith__test01:15
=== Tsmith__ is now known as tsmith
=== tsmith is now known as Tsmith
TsmithAlright.  I have set up a bzr repository via bzr+ssh:// on a remote server.  On my local box, I have grabbed a branch of that via $ bzr get.  I have made a lot of changes to this branch locally and now want to update the remote repository.  How do I do this?01:16
LeoNerdbzr push   to the same URL01:16
Tsmithu know... that's actually pretty damn nice01:17
Tsmithi can have revision control and have my local dev box be totally fucked and not affect the root but still get updates01:17
Tsmithi've used CVS/SVN for 10 years now, but let me tell you, two days of using bzr has totally rocked my world01:18
Tsmithis there a way to do bzr diff on the remote repository banch?01:18
TsmithALRIGHT! so bzr push on local and bzr update on remote01:22
TsmithLeoNerd, thank you very much01:22
PengTsmith: Generally, the repo on the server shouldn't have a working tree.01:39
Tsmithwhats that mean?01:39
Tsmith> confused <01:40
Tsmithi come from the SVN world01:40
PengTsmith: You shouldn't keep a working tree on the remote side. (Bazaar branches can operate with or without one.)01:40
Tsmithwoah01:40
PengTsmith: (Y'know, the working copy.)01:40
LeoNerdA branch stores history.01:41
LeoNerdA working copy is a checkout of some point in that history, possibly with local modifications, likely because you want to commit that as a new point in history01:41
PengTsmith: Push to e.g. /srv/bzr/foo on the server, then if you need a working copy on the server, "bzr branch" or "bzr checkout" that location.01:41
Tsmithso i think i have a "working copy" on the server in /var/bzr/sbconsultants; and i access this *remotely* via $ bzr get bzr+ssh://hopeseekr@server/var/bzr/sbconsultants01:41
LeoNerdA repository on a server generally only needs the former.. Though nothing stops it having the latter as well01:41
Tsmithis that right?01:41
PengTsmith: If you really need a working copy there, you can install the push-and-update plugin.01:42
Tsmithi dont want a working copy01:42
Tsmithi guess i installed it really wrong01:42
PengTsmith: No. Bazaar uses three things: the repository, which is a big bag of revision data; the branch, which is basically just a list of revisions, and the working tree.01:42
PengTsmith: You should read the user guide or something.01:43
Tsmithi started the repository on my local dev box, tar gzipped up the entire damn thing, uploaded and uncompressed on the remote server in /var/bzr, deleted my own local copy, and ran the bzr get bzr+ssh:// thing01:43
Tsmithlol it seems to work tho ;)01:43
PengTsmith: You could've just pushed instead of tarred it.01:44
Tsmithare the only files on the remote server that are needed in /var/bzr/sbconsultants/.bzr?01:44
Tsmithit seems there's a .bzr in every branch01:45
PengTsmith: Anyway, to remove the working tree from a branch, run "bzr remove-tree". From the shared repo, also do "touch .bzr/repository/no-working-trees" so that new branches won't be created with working trees.01:45
Tsmithalright01:45
Tsmithnow i have a db.php.~1~01:46
Tsmith; is that some internal backup or important?01:46
PengTsmith: It's a backup, made when bzr would be overwriting/deleting a file you've modified.01:49
PengTsmith: E.g. when you run "bzr revert some-file.txt".01:49
Tsmithahhhhh01:49
bob2wonder why --no-trees osn't the default02:35
Odd_Blokebob2: Because then whenever you branched while doing normal development, you'd also have to checkout.02:36
Odd_BlokeWhich would be inconvenient and unnecessary.02:36
bob2hm, I just meant changing the default for the init-repo command02:39
bob2would that still have that effect?02:41
jelmerbob2: repositories are meant to be "just a storage optimization". having the behaviour of creating a working tree when creating a new branch depend on whether you are in a repository is inconsistent with that02:52
bob2ahh, right02:55
Odd_Blokebob2: If you wanted to make that the default behaviour, you could use an alias.03:03
bob2oh, I have03:03
hgrhave a feature-request for qbzr, is this the rigth place? :)13:40
bob2prbably better to file a nug so it doesn/t get forgotten13:42
bob2er, bug13:42
WarddrWhat makes bazaar better then SVN?14:55
jelmerWarddr, you may want to have a look at http://jam-bazaar.blogspot.com/2007/10/bazaar-vs-subversion.html14:56
WarddrAnd how can I save a location for bazaar? Now I get this error:15:23
Warddrwarddr@warddr-laptop:~/ludem-ward-test$ bzr merge15:23
Warddrbzr: ERROR: No location specified or remembered15:23
bob2"bzr merge --remember someurl" will remember someurl15:25
Warddrty bob2, sounds logical15:26
Warddrbob2, ty, it's working15:28
LaserJockanybody know how to flush the disk cache from CLI?16:54
jelmerLaserJock, 'sync'17:00
LaserJockjelmer: ah, thanks. seems simple enough :-)17:00
LaserJockseems I need to redo all my performanc tests17:01
nysinI've been trying to use bzr gconflicts and it's nice and all except that it seems to save things back into foo.{BASE,THIS,OTHER} without touching the actual file in which the conflict is to be resolved. Is this the case?17:17
nysin(since that's how it launches the 3rd party merge/diff viewer)17:17
=== `6og is now known as Kamping_Kaiser
LaserJockso I'm thinking of an easy way to time a big merge on the linux tree18:18
LaserJockif I put 2.6.0 into a repo, then import 2.6.25.118:19
LaserJockthen branch that, import 2.6.25.2 into the branch18:20
LaserJockthen finally merge that back to the main branch18:20
LaserJockdoes that sound like a reasonable test?18:20
fullermdDepends what you're testing.18:21
fullermdIt would merge a fair numbe of files, to be sure.  But only one revision.  And only on a 2-rev history.18:21
LaserJockfullermd: yeah, that's for sure the weakness of my test18:22
fullermdThe emacs switchover is a good demonstration that vhast improvements in scaling with tree size generally don't bleed over into scaling with history size   :|18:23
LaserJockbut I don't really want to completely convert the entire git repo into bzr and hg18:23
=== bigdo5 is now known as bigdo2
nysinSo if bzr-gtk launches its diff3 program with only the {OTHER,BASE,THIS} filenames, is the intended workflow to perform whatever merges are desired to an arbitrarily chosen file and then copy that file over to the one actually under revision control?19:09
swegnerHi all.  I'm starting a new project that I'd like to have hosted on Launchpad, so I'm trying to get used to the bzr version control.  When I have a group of contributors making commits, will they each need their own "branch", or is there a way to register one global "trunk" for the project's developers?22:34
beunoswegner, you can have a global trunk22:35
beunojust create a team22:35
beunoupload the trunk to the team22:35
beunoand add all the members you want to have access to that team22:36
swegnerthat makes sense22:36
swegnerok, I'm going to get started on that-- thanks for the tip  :)22:36
beunoswegner, np, and welcome  :)22:37

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!