Inkscape with git-bzr-ng, error pulling from trunk
Hi I'm following the instructions on our website at [1] but I'm missing one critical part of information.
If I clone the repository one weekend and then come back to it a week later the first thing I need to do is to update master branch (lp:inkscape / trunk) so I have the latest commits on my local machine. How is this done properly?
"git bzr sync" from [2] seems to be the right command but I'm not sure, it succeeds without errors most of the time. "git pull" doesn't work because I don't have any remotes in my "git" repository. "git bzr pull" gives errors some times but not always.
The errors I get from both "git bzr sync" and "git bzr pull" are as follows: "warning: Not updating refs/heads/bzr/master (new tip bbdb26a8c9d67d9c75d03c43b8db4686008a0913 does not contain deaf8922dbca36e15fe43a72b2b4320ae649a42f)"
The message is sort of obvious that my local branch and remote have diverged but they have not when I compare "git log" with the commits available on launchpad in lp:inkscape.
[1] https://inkscape.org/en/develop/using-git-repositories/ [2] https://bazaar.launchpad.net/~termie/git-bzr-ng/master/view/head:/README.rst
Any help is appreciated. Regards -- Christoffer Holmstedt
Christoffer Holmstedt <christoffer.holmstedt@...400...> writes:
Hi I'm following the instructions on our website at [1] but I'm missing one critical part of information.
If I clone the repository one weekend and then come back to it a week later the first thing I need to do is to update master branch (lp:inkscape / trunk) so I have the latest commits on my local machine. How is this done properly?
"git bzr sync" from [2] seems to be the right command but I'm not sure, it succeeds without errors most of the time. "git pull" doesn't work because I don't have any remotes in my "git" repository. "git bzr pull" gives errors some times but not always.
The errors I get from both "git bzr sync" and "git bzr pull" are as follows: "warning: Not updating refs/heads/bzr/master (new tip bbdb26a8c9d67d9c75d03c43b8db4686008a0913 does not contain deaf8922dbca36e15fe43a72b2b4320ae649a42f)"
The message is sort of obvious that my local branch and remote have diverged but they have not when I compare "git log" with the commits available on launchpad in lp:inkscape.
[1] https://inkscape.org/en/develop/using-git-repositories/%5B2] https://bazaar.launchpad.net/~termie/git-bzr-ng/master/view/head:/README.rst
Any help is appreciated.
I havent actually tried using git with the inkscape repo yet, but I did use git a lot with the emace bzr repo before emacs switched to git upstream.
At that time I found that the termie git-bzr-ng code wasnt stable.
What did work was felipec:s code:
https://github.com/felipec/git
He has a git-remote-bzr helper.
Again, I havent yet tried it with the inkscape repo, only the emacs bzr repo. The emacs bzr repo was however very complicated in terms of history etc.
Regards
Christoffer Holmstedt
Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/__________________________________________... Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Thanks for the information Joakim. As you say git-fc has the git-remote-bzr helper which I was about to try anyway. I will try that out and if I find it easier to use with inkscape repository I will update the information on our homepage. -- Christoffer Holmstedt
2015-03-09 23:56 GMT+01:00 <joakim@...1974...>:
Christoffer Holmstedt <christoffer.holmstedt@...400...> writes:
Hi I'm following the instructions on our website at [1] but I'm missing one critical part of information.
If I clone the repository one weekend and then come back to it a week later the first thing I need to do is to update master branch (lp:inkscape / trunk) so I have the latest commits on my local machine. How is this done properly?
"git bzr sync" from [2] seems to be the right command but I'm not sure, it succeeds without errors most of the time. "git pull" doesn't work because I don't have any remotes in my "git" repository. "git bzr pull" gives errors some times but not always.
The errors I get from both "git bzr sync" and "git bzr pull" are as follows: "warning: Not updating refs/heads/bzr/master (new tip bbdb26a8c9d67d9c75d03c43b8db4686008a0913 does not contain deaf8922dbca36e15fe43a72b2b4320ae649a42f)"
The message is sort of obvious that my local branch and remote have diverged but they have not when I compare "git log" with the commits available on launchpad in lp:inkscape.
[1] https://inkscape.org/en/develop/using-git-repositories/%5B2] https://bazaar.launchpad.net/~termie/git-bzr-ng/master/view/head:/README.rst
Any help is appreciated.
I havent actually tried using git with the inkscape repo yet, but I did use git a lot with the emace bzr repo before emacs switched to git upstream.
At that time I found that the termie git-bzr-ng code wasnt stable.
What did work was felipec:s code:
https://github.com/felipec/git
He has a git-remote-bzr helper.
Again, I havent yet tried it with the inkscape repo, only the emacs bzr repo. The emacs bzr repo was however very complicated in terms of history etc.
Regards
Christoffer Holmstedt
Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/__________________________________________... Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
-- Joakim Verona
With git-fc I used "git clone" for getting a local copy of inkscape repository last weekend and continued on (later same day) with some "get fetch" and "git pull" (only fast-forwards), with my normal git workflow (git-flow more or less). Last weekend I experienced some difficulties with "git fetch" downloading the entire repository every time.
Today I tried again with "git fetch" and a fast-forward merge and it only downloaded the last weeks changes (as I originally expected).
Joakim, have you experienced anything like I did last weekend? (just curious because I can't reproduce it today). -- Christoffer Holmstedt
2015-03-10 6:59 GMT+01:00 Christoffer Holmstedt <christoffer.holmstedt@...400...>:
Thanks for the information Joakim. As you say git-fc has the git-remote-bzr helper which I was about to try anyway. I will try that out and if I find it easier to use with inkscape repository I will update the information on our homepage. -- Christoffer Holmstedt
2015-03-09 23:56 GMT+01:00 <joakim@...1974...>:
Christoffer Holmstedt <christoffer.holmstedt@...400...> writes:
Hi I'm following the instructions on our website at [1] but I'm missing one critical part of information.
If I clone the repository one weekend and then come back to it a week later the first thing I need to do is to update master branch (lp:inkscape / trunk) so I have the latest commits on my local machine. How is this done properly?
"git bzr sync" from [2] seems to be the right command but I'm not sure, it succeeds without errors most of the time. "git pull" doesn't work because I don't have any remotes in my "git" repository. "git bzr pull" gives errors some times but not always.
The errors I get from both "git bzr sync" and "git bzr pull" are as follows: "warning: Not updating refs/heads/bzr/master (new tip bbdb26a8c9d67d9c75d03c43b8db4686008a0913 does not contain deaf8922dbca36e15fe43a72b2b4320ae649a42f)"
The message is sort of obvious that my local branch and remote have diverged but they have not when I compare "git log" with the commits available on launchpad in lp:inkscape.
[1] https://inkscape.org/en/develop/using-git-repositories/%5B2] https://bazaar.launchpad.net/~termie/git-bzr-ng/master/view/head:/README.rst
Any help is appreciated.
I havent actually tried using git with the inkscape repo yet, but I did use git a lot with the emace bzr repo before emacs switched to git upstream.
At that time I found that the termie git-bzr-ng code wasnt stable.
What did work was felipec:s code:
https://github.com/felipec/git
He has a git-remote-bzr helper.
Again, I havent yet tried it with the inkscape repo, only the emacs bzr repo. The emacs bzr repo was however very complicated in terms of history etc.
Regards
Christoffer Holmstedt
Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/__________________________________________... Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
-- Joakim Verona
participants (2)
-
unknown＠example.com -
Christoffer Holmstedt