← Back to team overview

ubuntu-manual team mailing list archive

Re: Issues with edits

 

Another piece of advice.

Before you commit. Do a bzr pull to ensure you have the latest upstream edits.

Chris


On 8 April 2013 10:20, Hannie Dumoleyn <lafeber-dumoleyn2@xxxxxxxxx> wrote:
> Hi Jim,
> I am sorry to hear you had such a struggle with bzr. Perhaps I can give you
> one tip that might be useful and that works for me.
> Before I make changes to a tex file I copy the original one to another
> folder, e.g. /manual-raring. I make changes to
> /manual-raring/name-of-chapter.tex, and when finished I copy it to
> /Projects/raring, rename it, test it and when successful I commit. this is
> for me the safest way to prevent loss of changes I made.
>
> To what edits do you refer when you say: "...and am concerned about some of
> the edits I now see (edits I did not do)."?
>
> There is no \icon tag, as far as I know.
>
> The latest version I see is version 100. I guess with "version 101 is in
> bzr" you mean that it is on your pc, but not in Launchpad yet because you
> cannot push. You can just push it when you are back on your main system
> again.
>
> Finally, take your time. No problem if you need time until the end of this
> week. The Ubuntu-desktop chapter is one of the most difficult chapters to
> edit. We very much appreciate the work you do (not only on this chapter) and
> hope you are not too much put off by the problems you encountered. Be
> assured that your team mates are here to help.
>
> Best regards,
> Hannie
>
>
> Op 08-04-13 06:53, Jim Connett schreef:
>
> Good evening all,
>
> With Kevin's help, I finally got bzr to work correctly, but this required me
> to do an "uncommit" on my errant branch. Now that I'm back onto the main
> branch, I'm looking through version 100 in the Ubuntu Desktop section and am
> concerned about some of the edits I now see (edits I did not do). In doing
> an uncommit, I've also lost the edits I had in place (which were replaced by
> edits in version 100, so I did my best to rip through the section again and
> try to remember where all the edits needed to occur, but to be honest, I've
> lost confidence in this section and will require a couple more days to look
> it over again.
>
> Secondly, I've added the /icon tag in place of the /lens tag in the Ubuntu
> Desktop section, however, this prevents the make file from working
> correctly; at every /icon tag, it throws an error. I can get by the error
> simply by pressing <enter>, but this recovery is less-than-ideal. Is there
> something I need to do on my end to make this work or is this a problem
> elsewhere?
>
> Thirdly, the current version is 101 in bzr, but, for whatever reason, I can
> PULL but not PUSH on the laptop I'm using. If someone can push out 101, I'd
> appreciate it. I'll get back on my main system tomorrow night.
>
> Sorry for all the problems. This iteration has proven less than satisfactory
> for a host of reasons. I hope by the middle of the week, I'll have regained
> the confidence in my edits. Of course, I invite anyone to read over the
> section, making edits where necessary.
>
> --Jim
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~ubuntu-manual
> Post to     : ubuntu-manual@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~ubuntu-manual
> More help   : https://help.launchpad.net/ListHelp
>
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~ubuntu-manual
> Post to     : ubuntu-manual@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~ubuntu-manual
> More help   : https://help.launchpad.net/ListHelp
>


References