| JPeterson | can i apply a git patch to bzr? including author and comment? | 00:56 |
|---|---|---|
| JPeterson | is that in the git plugin? | 00:56 |
| JPeterson | jelmer: | 00:56 |
| jelmer | JPeterson: 'bzr git-apply' does some of that | 01:06 |
| jelmer | JPeterson: it doesn't cope with new files at all though | 01:06 |
| JPeterson | thx | 01:06 |
| jelmer | (and is still very experimental in general) | 01:06 |
| jelmer | JPeterson: in other words, use with care | 01:07 |
| JPeterson | jelmer how do i bzr pull --rebase? | 02:24 |
| JPeterson | i want to pull a remote branch to a new branch | 02:24 |
| jelmer | there is 'bzr rebase --pull' I think, perhaps that's what you mean? | 02:24 |
| JPeterson | so i created a new local branch to pull to | 02:24 |
| JPeterson | so it's " --pull' I think, perhaps that's what you mean? | 02:25 |
| JPeterson | [03:24] <JPeterson> so i create | 02:25 |
| JPeterson | ops | 02:25 |
| JPeterson | so it's "bzr rebase --pull lp:~john-peterson/calibre/context"? | 02:25 |
| JPeterson | that returns "bzr: ERROR: no such option: --pull" | 02:25 |
| jelmer | JPeterson: oh, actually I think the default 'bzr rebase does what you are asking about | 02:26 |
| jelmer | (or maybe it just tells you to pull if pulling is possible?) | 02:27 |
| JPeterson | ok i'll try "bzr rebase lp:~john-peterson/calibre/context" | 02:27 |
| JPeterson | it returns | 02:30 |
| JPeterson | Contents conflict in src/calibre/utils/fonts/subset.py | 02:30 |
| JPeterson | that's unexpected because rebase will not consider conflicts | 02:30 |
| JPeterson | how do i | 02:31 |
| JPeterson | Resolve the conflict and run 'bzr rebase-continue' | 02:31 |
| jelmer | JPeterson: I'm not sure I follow - rebase can cause conflicts in git too | 02:32 |
| JPeterson | how do i force revert rebase? | 02:32 |
| jelmer | "bzr rebase-abort" | 02:32 |
| JPeterson | why not bzr rebase-continue? | 02:33 |
| JPeterson | how do i resolve the conflict by using the remove version? | 02:35 |
| JPeterson | *remote | 02:35 |
| jelmer | JPeterson: if you mean to abort (iow, revert) the rebase, that's what 'bzr rebase-abort' does | 02:36 |
| jelmer | JPeterson: 'bzr rebase-continue' will continue the rebase once conflicts have been resolved | 02:36 |
| JPeterson | what i mean is ignore conflicts or use the remove version, and force it to complete | 02:36 |
| JPeterson | bzr resolve; bzr rebase-continue | 02:36 |
| JPeterson | return | 02:37 |
| JPeterson | Remaining conflicts: | 02:37 |
| JPeterson | Contents conflict in src/calibre/utils/fonts/subset.py.THIS | 02:37 |
| JPeterson | bzr: ERROR: There are still conflicts present. Resolve the conflicts and then run 'bzr resolve' and try again. | 02:37 |
| jelmer | JPeterson: see the help on 'bzr resolved' | 02:37 |
| jelmer | JPeterson: you need to resolve the conflicts by editing the file, or explicitly specify what you want to happen to 'bzr resolve' | 02:37 |
| JPeterson | so do i add a dot, as in and try again. | 02:37 |
| JPeterson | [03:36] <jelmer> J | 02:37 |
| JPeterson | ?ops | 02:37 |
| JPeterson | as in bzr resolve . | 02:38 |
| JPeterson | i did | 02:38 |
| jelmer | JPeterson: that doesn't matter; 'bzr resolve' will only mark things as resolved if the conflict markers are gone *or* if you have specified an explicit action to take | 02:38 |
| JPeterson | bzr resolve src/calibre/utils/fonts/subset.py.THIS | 02:38 |
| JPeterson | now | 02:38 |
| JPeterson | bzr resolve; bzr rebase-continue | 02:38 |
| JPeterson | return | 02:39 |
| JPeterson | Remaining conflicts: | 02:39 |
| JPeterson | Contents conflict in src/calibre/utils/fonts/subset.py.THIS.THIS | 02:39 |
| JPeterson | bzr: ERROR: There are still conflicts present. Resolve the conflicts and then run 'bzr resolve' and try again. | 02:39 |
| JPeterson | it added another .THIS, compared to the previous message | 02:39 |
| jelmer | JPeterson: you'd want to resolve the file itself, not its .THIS file | 02:39 |
| JPeterson | bzr resolved src/calibre/utils/fonts/subset.py | 02:39 |
| JPeterson | returns | 02:39 |
| JPeterson | src/calibre/utils/fonts/subset.py does not exist | 02:39 |
| JPeterson | 0 conflicts resolved, 1 remaining | 02:40 |
| JPeterson | i'll try | 02:40 |
| JPeterson | bzr uncommit -r-100 | 02:40 |
| JPeterson | and try rebase again | 02:40 |
| JPeterson | maybe it will be easier to rebase forward | 02:41 |
| jelmer | rebase is almost exclusively useful for rebasing a few trivial local changes on top of an upstream branch | 02:52 |
| jelmer | it's not very advanced | 02:52 |
| jelmer | JPeterson: ^ | 02:52 |
| JPeterson | jelmer: then i shouldnt use it checkout a remote branch | 02:55 |
| JPeterson | then i should uncommit the local branch to before the remote branch and pull it | 02:55 |
| JPeterson | jelmer: am i correct to assume that "bzr fast-export --plain .|git fast-import" will also convert bzr branches to git branches? | 02:56 |
| jelmer | JPeterson: that will convert a bzr branch to a git branch; not sure what you mean by "also" though | 02:57 |
| JPeterson | jelmer: how do i convert all bzr branches to git branches? | 02:59 |
| JPeterson | jelmer: whats the --export-marks and --import-marks for in http://dgleich.wordpress.com/2011/01/22/convert-bazaar-to-git/ | 03:03 |
| JPeterson | why doesnt "man bzr fast-export" return what I want? | 03:09 |
| JPeterson | where is the bzr fast-export manual? | 03:09 |
| JPeterson | how do i access the repo from a different path? | 03:16 |
| JPeterson | accessing the repo from "~/shared.hgfs/source/Programs/calibre/repo" return "bzr: ERROR: Not a branch: "/C:/Files/Source/Programs/calibre/repo/"." | 03:17 |
| JPeterson | can i change something to a relative path? or do need to change the full path? in that case where? | 03:18 |
| JPeterson | jelmer: | 03:18 |
| JPeterson | it seems like it's | 03:19 |
| JPeterson | cat .bzr/branch/location | 03:19 |
| JPeterson | that is related to that message | 03:19 |
| JPeterson | can i change | 03:20 |
| JPeterson | file:///C:/Files/Source/Programs/calibre/repo/ | 03:20 |
| JPeterson | to | 03:20 |
| JPeterson | . | 03:20 |
| JPeterson | bzr switch context | 03:24 |
| JPeterson | return | 03:24 |
| JPeterson | bzr: ERROR: Not a branch: "/mnt/hgfs/shared/source/Programs/calibre/repo/,branch=context/". | 03:24 |
| JPeterson | why? how do i fix it? | 03:25 |
| JPeterson | the goal is to run "bzr fast-export --plain --git-branch=context|git fast-import" | 03:26 |
| JPeterson | (from linux as running it from cygwin return "error: git-fast-import died of signal 11") | 03:29 |
| JPeterson | jelmer if you wont answer this, then answer this how do i move a bzr repo? | 03:30 |
| JPeterson | so that i can use it from another path | 03:30 |
| JPeterson | i.o.w. how do i deal with .bzr/branch/location? | 03:32 |
| JPeterson | where is the bzr 2.6 ppa? | 03:36 |
| JPeterson | "sudo add-apt-repository -y ppa:bzr/ppa" didnt update it to 2.6 | 03:40 |
| JPeterson | ok it's "sudo add-apt-repository -y ppa:bzr/beta" | 03:41 |
| JPeterson | bzr branches | 03:43 |
| JPeterson | return | 03:43 |
| JPeterson | bzr: ERROR: Not a branch: "/mnt/hgfs/shared/source/Programs/calibre/repo/,branch=context/". | 03:43 |
| JPeterson | how does it come to that conclusion? | 03:43 |
| JPeterson | so does "bzr switch context" | 03:45 |
| JPeterson | it seems like "bzr switch --force context" works | 03:47 |
| JPeterson | ah ok it needs to be "file:///mnt/hgfs/shared/source/Programs/calibre/repo/" | 03:48 |
| JPeterson | can i export bzr commits to a git patch? | 06:31 |
| mgrandi | piping bzr log to a file should create a patch file | 06:35 |
| mgrandi | so like bzr log -r 1..5 > someFile.patch | 06:35 |
| JPeterson | mgrandi: i want the comment, date, author | 06:43 |
| JPeterson | with git patch i mean "git format-patch" | 06:44 |
| JPeterson | the commit sha1 can be anything, it doesnt matter | 06:45 |
| JPeterson | it would be surprising if there was not a way to do this | 06:45 |
| JPeterson | because of how simple if would be | 06:45 |
| mgrandi | what do you mean format-patch, not familiar with it | 06:46 |
| mgrandi | like a patch file that you pass to git? or to patch | 06:46 |
| mgrandi | ? | 06:47 |
| JPeterson | it has patch, comment, date, author | 06:47 |
| JPeterson | and parent commit sha1 which is not necessary | 06:47 |
| JPeterson | so can i bzr fast-export a limited number of commits? | 06:48 |
| mgrandi | probably, using the -r revisionspec thing | 06:48 |
| JPeterson | the repo has many commits, 22k, and i only need the top 5 | 06:48 |
| mgrandi | so bzr whatever -r -5..-1 | 06:48 |
| JPeterson | the bzr fast-export manual doesn't say what -r does | 06:49 |
| JPeterson | why would i expect it to export r to head rather than init to r? | 06:49 |
| JPeterson | what's the revisionspec for the top five commits? | 06:51 |
| mgrandi | it says -r ARG, --revision=ARG | 06:52 |
| mgrandi | it says to do bzr help revisionspec | 06:52 |
| mgrandi | and i told you, it was -r -5..-1 =P | 06:52 |
| mgrandi | also, this patch-format thing looks a lot like 'bzr testament --long" | 06:54 |
| mgrandi | or bzr send / bzr email | 06:56 |
| JPeterson | how can it be -r-1..-1? isn't that 0 commits? | 07:28 |
| JPeterson | omg it returns | 07:30 |
| JPeterson | warning: Not updating refs/heads/date (new tip bdf16f0ef570e6bb6e7e620899bee6f0edd69a81 does not contain 476e775c0e5ac5cb457f4c5ffe6a8ca50da662de) | 07:30 |
| JPeterson | how do i rename a branch? | 08:56 |
| LeoNerd | mv | 11:11 |
| Peng | bzr nick may also interest you | 11:31 |
| LarstiQ | JPeterson: if you have bzr-git, `bzr send` should have a git-format option iirc | 12:35 |
| JPeterson | LarstiQ: thx | 12:36 |
| JPeterson | bzr send --format=git | 14:05 |
| JPeterson | return | 14:05 |
| JPeterson | File "C:/Program Files (x86)/Bazaar/plugins\git\send.py", line 121, in to_lines | 14:05 |
| JPeterson | AttributeError: 'NoneType' object has no attribute 'splitlines' | 14:05 |
| JPeterson | additional trace is | 14:06 |
| JPeterson | File "bzrlib\builtins.pyo", line 5824, in run | 14:06 |
| JPeterson | File "bzrlib\send.pyo", line 136, in send | 14:06 |
| JPeterson | File "bzrlib\merge_directive.pyo", line 348, in compose_merge_request | 14:06 |
| JPeterson | bzr 2.6b1 on python 2.6.6 (Windows-7-6.1.7601-SP1) | 14:07 |
| === yofel_ is now known as yofel | ||
| Munchor | Hello | 18:40 |
| Munchor | Does bzr allow deleting commits? | 18:40 |
| Munchor | I know that with git+github I can actually delete like the last X commits. Can I do that with bzr+launchpad? | 18:40 |
| jelmer | Munchor: bzr uncommit | 18:42 |
| Munchor | bzr uncommit;bzr uncommit; | 18:43 |
| Munchor | that woudl delete 2 commits, right? | 18:43 |
| Munchor | And jelmer, bzr uncommit removes local commits, not commits on Launchpad AFAIK | 18:46 |
| LarstiQ | Munchor: bzr push --overwrite to launchpad will do that. Take note though that this will wreak havoc for anyone who already has a copy of what was on launchpad. | 18:54 |
| Munchor | >wreak havoc | 18:54 |
| Munchor | I don't fully understand that | 18:54 |
| LarstiQ | Munchor: be not nice | 18:55 |
| Munchor | I'm even more confused that | 18:55 |
| LarstiQ | Munchor: if you delete some commits, and then start developing from there again, your branch will have diverged from what other people had | 18:56 |
| LarstiQ | Munchor: so they can't simply `bzr pull` to get up to date | 18:56 |
| Munchor | Ooh I see | 18:56 |
| LarstiQ | and if they had done extra commits on top, merging their work in would resurrect the deleted commits | 18:56 |
| LarstiQ | Munchor: it's not the end of the world, but it's good to be aware of | 18:57 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!