On 11/6/12 20:11 , Chris Morley wrote: > I am ready to merge Gscreen into master. > So I pushed it to the buildbot as it's own branch to have buildbot test it.
Excellent! > It fails some tests. Here's a snip of the log: > > > install -m 0644 -o root ../share/gscreen/images/*.gif > ../share/gscreen/images/*.xbm //SNIP// > install: cannot stat `../share/gscreen/images/*.xbm': No such file or > directory > make[1]: Leaving directory > `/tmp/buildd/linuxcnc-2.6.0~pre~gscreen.master~6591a11/src' > I: unmounting dev/pts filesystem > install: cannot stat `../share/gscreen/images/*.ngc': No such file or > directory > make[1]: *** [install-python] Error 1 > make: *** [install] Error 2 > dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status > 2 > E: Failed autobuilding of package > > This is because I added a folder (gscreen/images) to git but I think I need to > tell debian about it. > > My question is - how do I do that :) I'll try to take a look at it this week some time. > Oh and my second question is when I'm done with my temporary gscreen_master > branch > how do I delete it? I can figure out how to delete my local branch, Just want > to be > sure to do it properly on linuxcnc's repo. You remove remote branches by using the full form of 'git push' like this: git push origin :my-branch Normally you say "git push origin my-branch", which actually means "git push origin my-branch:my-branch". The branch argument to push is "local:remote", and the local defaults to the same as the remote if not specified. By explicitly specifying no local branch (by saying ":remote-branch"), you say "push nothing to this remote branch", which is horrifying git-speak for "remove the remote branch". Make sense? -- Sebastian Kuzminsky ------------------------------------------------------------------------------ LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
