[00:27] <ubuntujenkins> how do i merge lp:~quickshotdevs/quickshot/luke-quickshot  into lp:quickshot?
[00:35] <MTecknology> ubuntujenkins: pull the lp:quickshot branch, go into that directory, then br merge lp:~quickshotdevs/quickshot/luke-quickshot
[00:35] <ubuntujenkins> cool thanks
[08:00] <scibotic> Hi, I want to have a subdirectory of a repository to have seperate defaults to the rest, is it safe to just initialise another in there or is there another way I should approach it?
[08:04] <scibotic> Oh hmmm, I probably should just avoid adding that directory ey?
[12:24] <en1gm4> Hi all
[12:25] <en1gm4> can anyoune tell me what's the command to view a screen like this: http://samba.org/~jelmer/bzr/bzrk.png
[12:25] <jelmer> en1gm4: bzr viz
[12:25] <jelmer> it's part of the bzr-gtk plugin
[12:25] <en1gm4> jelmer: thanks a lot!
[12:26] <en1gm4> yes I installed it but thought its command start with g***
[12:26] <en1gm4> ok it works thanks!
[16:28] <jelmer> maxb: hi
[18:53] <meoblast001> ok, i've probably asked this before, but i tend to forget things a lot
[18:53] <meoblast001> but when you move files, doesn't Bzr only log a move?
[18:53] <meoblast001> actually, i'm sure i've asked that before, but don't remember the answer
[19:25] <ronny_> meoblast001: kind of, it just reflects the changed locations of things in the inventory
[19:26] <meoblast001> ok, so it doesn't log as file deleted, new file created?
[19:26] <ronny_> just a move
[19:28] <meoblast001> ah, ok, goo
[19:28] <meoblast001> d
[19:29] <ronny_> i dont think there is a vcs that records a delete+new (all that im aware of is recording copy+delete)
[19:44] <luks> ronny_: CVS? :)
[19:45] <ronny_> luks: is cvs really a vcs?
[19:46] <lifeless> certainly
[19:46] <luks> well, it has it even in it's name
[19:46] <lifeless> ronny_: git
[19:46] <lifeless> ronny_: (doesn't record copies, so it does delete + new)
[19:46] <ronny_> lifeless: git doesnt record deletes either, it just records tree state
[19:47] <lifeless> ronny_: well, from that angle so does bzr
[19:48] <ronny_> lifeless: bzr cares about item histories and where a item is uniequely placed
[19:48] <ronny_> git is just a state of trees of blob
[19:48] <lifeless> ronny_: its tooearly for this. I assure you though, bzr does not record deltas.
[19:49] <lifeless> any more than git does; bzr is snapshot focused.
[19:49] <ronny_> lifeless: i didnt mention deltas, afair all of the major 'good' vcs's see them as internal optimazion
[19:50] <ajeans> jelmer: I'm coming from LP #533407, do you have instructions on how to use the trunk versions of dulwich and git ?
[19:50] <lifeless> well you claim 'git doesn't record deletes' - a delete is part of a delta
[19:50] <lifeless> you can't have a debate about 'storing deletes' - or not - without the concept of a delta being present.
[19:50] <ajeans> jelmer: I grabbed the trunks of both, but how do I set them up ?
[19:50] <luks> darcs doesn't count as good anymore?
[19:51] <ronny_> luks: darcs isnt major
[19:51] <lifeless> I wants: http://web.media.mit.edu/~marcelo/cornucopia/
[19:52] <luks> heh
[19:52] <ronny_> lifeless: everyone that saw star-trek does
[19:52] <lifeless> :)
[19:53] <ronny_> hmm, i think git is the most snapshot oriented, bzr carries way too much metadata about inventories
[19:56] <luks> only the file ID
[19:56] <luks> the rest is the same
[19:56] <luks> but the file ID makes a big difference
[19:56] <ronny_> where?
[19:57] <luks> the difference? in how you can view the system
[19:58] <ronny_> the only thing it really can help is annotate on a single file history
[19:58] <luks> oh, I didn't mean functional differences
[19:59] <ronny_> my usual view is tree of files' how do file-id's add a new perspective?
[20:01] <luks> they don't (most filesystems represent files as ids anyway), git's no-file-ids add a new perspective
[20:02] <ronny_> so where do they make the difference in viewing the system
[20:02] <luks> in the definition of a snapshot
[20:03] <luks> you said that git is the most snapshot oriented system
[20:03] <luks> but the only difference is that bzr keeps file ids
[20:03] <luks> so there is a difference in what people consider to be snapshots
[20:04] <ronny_> bzr has a lot of metadata that relates items within one snapshot to the previous snapshot
[20:05] <lifeless> no
[20:05] <luks> what kind of metadata?
[20:05] <lifeless> relates items in one snapshot to any other snapshot <- I'll accept that statement
[20:05] <lifeless> luks: file id, content-revision-id
[20:06] <ronny_> lifeless: my sloppy wording again :(
[20:06] <luks> oh right, I forgot about per-file revisions
[20:06] <lifeless> ronny_: :P de nada
[20:15] <ronny_> lifeless: i decided to degrade bzr from fully wanted to 'pass the tests' in anyvc
[20:34] <lifeless> ronny_: oh, thats a shame
[20:55] <ronny_> lifeless: since having bzr in my mind actively complicated some of my mindmodels more than ever should be necessary i lost all reasons not to
[22:14] <itistoday> anyone from japan here? Or know japanese immigrants who've lived in the USA whom I can ask a few questions?
[22:55] <mwhudson> jelmer: "merge dave" isn't much of a commit message :-)
[22:56] <mneptok> mwhudson: but makes a great potential title for a romantic comedy (or porn film)
[23:07]  * jelmer tries to be smart and keeps quiet
[23:41] <RenatoSilva> is there any command for undoing a given diff?
[23:42] <bob2> kinda out of scope
[23:42] <bob2> patch -R
[23:43] <RenatoSilva> bzr: ERROR: no such option: -R
[23:43] <bob2> nothing to do with bzr
[23:43] <bob2> the gnu patch tool can apply diffs backwards
[23:43] <RenatoSilva> can you get what I want?
[23:43] <RenatoSilva> e.g. you are in rev 100
[23:43] <RenatoSilva> then you realize that rev 80 was a mistake, then you want to undo it
[23:44] <idnar> bzr merge -r 80..79
[23:44] <RenatoSilva> it would be nice to have something like bzr revert -r 80
[23:44] <idnar> or...
[23:44] <RenatoSilva> idnar: nice, will try it
[23:44] <idnar> hmm
[23:44] <idnar> doesn't look like there's an easier way to specify it
[23:45] <idnar> -c 80 will get you 79..80
[23:45] <bob2> -c -80?
[23:46] <RenatoSilva> bzr merge -r 80..79 doesn't work, it generates a conflict in a file, non-sense, the file wasn't edited in that revision
[23:46] <bob2> bet you it was
[23:46] <idnar> bob2: -80 will get you the revision 80 revisions before HEAD, I think
[23:46] <bob2> ah
[23:47] <idnar> RenatoSilva: are you sure r80 is the one you want to revert?
[23:47] <RenatoSilva> of course
[23:47] <RenatoSilva> it's actually 146, but that doesn't matter
[23:47] <idnar> so you're using -r 146..145?
[23:47] <RenatoSilva> 146 should not exist, so bzr merge -r 146..145
[23:47] <RenatoSilva> yes
[23:48] <fullermd> You need the dot.  "bzr merge -r80..79 ."
[23:48] <RenatoSilva> oh
[23:48] <idnar> oh, that's my bad
[23:48] <fullermd> That won't make it not exist.  It just reverses the change and sets you up to commit that.
[23:48] <RenatoSilva> of course
[23:48] <fullermd> There's no way to make it not exist without rewriting all the revs after.
[23:48] <RenatoSilva> no one said it would
[23:48] <fullermd> Well, re "<RenatoSilva> 146 should not exist [...]"
[23:49] <RenatoSilva> fullermd: and?
[23:49] <fullermd> Just sayin'.
[23:49] <RenatoSilva> no, I didn't say
[23:49] <bob2> oh, I think RenatoSilva meant "146 is the rev I'd like to undo the effect of"?
[23:49] <RenatoSilva> should != will
[23:50] <fullermd> I know.  I'm just clarifying.
[23:50] <RenatoSilva> bob2: should not exist == if I could go back in time, I would not commit it
[23:51] <RenatoSilva> which may be possible if I find The Island
[23:51] <RenatoSilva> fullermd: ok
[23:52] <RenatoSilva>  bzr merge -r 146..145 . is sort of workaround right? it generates a conflict for the change, it doesn't actually patch the file
[23:53] <RenatoSilva> hmm, it doesn't work either
[23:53] <bob2> it's not a workaround, it is asking bzr to undo that change
[23:53] <RenatoSilva> if I simply accept the merge source, I could be reverting valid changes in further commits (my case here)
[23:54] <RenatoSilva> <<<<<<< TREE
[23:54] <RenatoSilva> div.header, div.footer, div.sidebar, ul#timings, div#interwiki, table.navigation, a.action {
[23:54] <RenatoSilva> [23:54] <RenatoSilva> div.header, div.footer, div.sidebar, div#interwiki {
[23:54] <RenatoSilva> >>>>>>> MERGE-SOURCE
[23:54] <RenatoSilva> it should be:
[23:54] <RenatoSilva> div.header, div.footer, div.sidebar, div#interwiki, ul#timings, {
[23:54] <RenatoSilva> >>>>>>> MERGE-SOURCE
[23:54] <bob2> is this repo available?
[23:55] <RenatoSilva> hmm that's right
[23:55] <RenatoSilva> if a further rev did not chnage that line, the conflict would not happen I think
[23:55] <idnar> if there have been other changes since r146 that conflict with undoing r146, then I would expect to see conflicts
[23:55] <idnar> which you'll then have to manually resolve
[23:55] <RenatoSilva> it's really a conflict I must solve
[23:57] <RenatoSilva> so ok, my bad, but I don't get bzr merge -r 146..145 ., although I know the pratical result. I would get better bzr revert -r 146..145
[23:57] <RenatoSilva> anyway, this is not so useful, it's more easy to just see the changes and undo them manually
[23:58] <RenatoSilva> but thanks all anyway
[23:59] <RenatoSilva> is there how to bzr diff -r 146..<current_uncommitted_changeset>?
[23:59] <lifeless> bzr diff -r 146
[23:59] <RenatoSilva> ok thanks!