| nataren | Hello. I am running bzr 1.16.1 on Windows, and I have a rules files saying 'eol = native', it used to work fine but all of a sudden stopped working, and now my checkout come down as LF only. | 00:12 |
|---|---|---|
| nataren | Do you have any advice on how I can make it work fine. | 00:13 |
| nataren | I am experiencing nasty merge conflicts due to the newlines problem. | 00:13 |
| nataren | I created the repo and the branch as --2a | 00:13 |
| === Ursinha is now known as Ursinha-afk | ||
| === FryGuy_ is now known as FryGuy- | ||
| rioch | I've just committed some code and I have a release ready. I want to tag this. Is it just a case of doing: bzr tag <tag-name> or do I need to specify the revision? I assume I also need to push after the tag? | 12:15 |
| fullermd | tag will tag the head of the branch if you don't specify a revision, so if that's the rev you want to tag... | 12:18 |
| rioch | it is :) | 12:18 |
| rioch | is it also possible to get a list of all the tags? | 12:18 |
| fullermd | tags | 12:19 |
| rioch | it's strange that bzr status doesn't show that I've created a tag | 12:20 |
| fullermd | Why would it? | 12:20 |
| rioch | because my local repo. isn't the same as the repo. in launchpad, so I need to push that tag over there. I use bzr status as a way of seeing if I need to do that. | 12:21 |
| fullermd | Ah. Then you're misusing status ;) | 12:21 |
| fullermd | It talks about uncommitted stuff. Doesn't have anything to say about differences between two branches. | 12:21 |
| rioch | :) good point | 12:22 |
| rioch | but I do need to push this tag to get it into launchpad, right? | 12:22 |
| lifeless | yes | 12:22 |
| fullermd | (and tags don't get committed anyway, so status wouldn't have anything to say about them regardless) | 12:22 |
| lifeless | please file a bug about status not showing the tag | 12:22 |
| fullermd | Err? | 12:22 |
| lifeless | fullermd: people look there. therefore we should do *something* to make it clear either what does happen, or perhaps do what they expect | 12:23 |
| rioch | I'm confused. If I tag and then push, it says "no new revision to push", so how do I get my tag into launchpad? | 12:24 |
| lifeless | that should have pushed it | 12:24 |
| rioch | even when it said "no revisions to push" it still pushed something? | 12:26 |
| fullermd | Yeah, there's a bug about that. | 12:26 |
| rioch | ah ok. | 12:26 |
| fullermd | push only _talks_ about revisions, though it does push tags too. | 12:26 |
| fullermd | Actually, at one point it didn't push tags if there weren't revs to push too, but I'm pretty sure that one got squashed a while ago. | 12:26 |
| rioch | can I verify that it pushed it in launchpad? | 12:27 |
| fullermd | `bzr tags $URL`. Probably `bzr tags :push` in your branch, since the LP branch is presumably the push location. | 12:27 |
| rioch | I normally do bzr push lp:prioritise | 12:30 |
| rioch | I did bzr tags -d lp:prioritise and it took a bit of time, then came back with the tag so I think it's in there. | 12:33 |
| rioch | If not, I can remember revision 10 for now :D | 12:33 |
| fullermd | Yeah, tags is probably a bit slow remotely, looking up revids. | 12:34 |
| fullermd | tags --show-ids may be faster since it doesn't have to do the translations. | 12:34 |
| fullermd | prioritise-0.1.0 jon@nijmegen-20100717110900-hdevk45kz74p5rck | 12:35 |
| rioch | :) | 12:39 |
| Anteru1 | Hi | 18:53 |
| Anteru | Hi | 18:54 |
| rockstar | jam, https://bugs.edge.launchpad.net/tarmac/+bug/604741 | 21:02 |
| ubot5 | Launchpad bug 604741 in Tarmac "HookFailed is deprecated (affected: 1, heat: 6)" [Undecided,New] | 21:02 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!