From: Denis B. <dbi...@wa...> - 2013-10-26 07:00:29
|
Hi, when I tried to update the hg repository this morning, I got a problem probably due to a new dev branch after the 2.6.4 release. Pull is okay (at least almost, see 'merge' message): ######################################################################## $ hg pull Password: pulling from ssh://den...@hg.../p/texstudio/hg searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) remote: X11 forwarding request failed on channel 0 ##################################################################### Update is not okay: ##################################################################### $ hg update abandon (give up): crosses branches (merge branches or use --clean to discard changes) ##################################################################### and I'm not sure what should I do. Thanks for any hint. -- Denis |
From: Denis B. <dbi...@wa...> - 2013-10-31 09:03:01
|
Hi, I still have a problem with hg: I made a commit yesterday: $ hg log texstudio_fr.ts | less changeset: 4076:13c05325f458 parent: 4073:21d2dc12c1a6 user: Denis Bitouzé <dbi...@wa...> date: Wed Oct 30 15:15:22 2013 +0100 summary: Update French translations [...] that was lost after check out (pull & update) this morning. After check out this morning, I reverted the lost changes in texstudio_fr.ts, commited and wanted to push but I got: $ hg commit -m "Update French translations" texstudio_fr.ts texstudio_fr.qm && hg push [...] pushing to ssh://den...@hg.../p/texstudio/hg searching for changes abandon : push creates new remote head 13c05325f458! (did you forget to merge? use push -f to force) remote: X11 forwarding request failed on channel 0 Maybe I should do 'hg merge' but I don't know when. Could you let me know if I do something wrong in the way I deal with TXS hg repository: ##################################################################### # Check out cd ~/InstallationsLocales/texstudio/texstudio-hg && hg pull && hg update # Commit & push cd ~/InstallationsLocales/texstudio/texstudio-hg && hg commit -m "<message>" <file1> [<file2> ...] && hg push ##################################################################### Regards. -- Denis |
From: Jan S. <sun...@gm...> - 2013-10-31 11:07:38
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div> <div>Hi Denis,</div> <div> </div> <div>hg update is not always the best solution.</div> <div>Have you tried.</div> <div>hg pull && hg merge ?</div> <div> <div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"> <div style="margin:0 0 10px 0;"><b>Gesendet:</b> Donnerstag, 31. Oktober 2013 um 10:02 Uhr<br/> <b>Von:</b> "Denis Bitouzé" <dbi...@wa...><br/> <b>An:</b> tex...@li...<br/> <b>Betreff:</b> Re: [TeXstudio-list] hg update problem</div> <div name="quoted-content">Hi,<br/> <br/> I still have a problem with hg: I made a commit yesterday:<br/> <br/> $ hg log texstudio_fr.ts | less<br/> <br/> changeset: 4076:13c05325f458<br/> parent: 4073:21d2dc12c1a6<br/> user: Denis Bitouzé <dbi...@wa...><br/> date: Wed Oct 30 15:15:22 2013 +0100<br/> summary: Update French translations<br/> <br/> [...]<br/> <br/> that was lost after check out (pull & update) this morning.<br/> <br/> After check out this morning, I reverted the lost changes in texstudio_fr.ts, commited and wanted to push but I got:<br/> <br/> $ hg commit -m "Update French translations" texstudio_fr.ts texstudio_fr.qm && hg push<br/> [...]<br/> pushing to ssh://den...@hg.../p/texstudio/hg<br/> searching for changes<br/> abandon : push creates new remote head 13c05325f458!<br/> (did you forget to merge? use push -f to force)<br/> remote: X11 forwarding request failed on channel 0<br/> <br/> Maybe I should do 'hg merge' but I don't know when. Could you let me<br/> know if I do something wrong in the way I deal with TXS hg repository:<br/> <br/> #####################################################################<br/> # Check out<br/> cd ~/InstallationsLocales/texstudio/texstudio-hg && hg pull && hg update<br/> <br/> # Commit & push<br/> cd ~/InstallationsLocales/texstudio/texstudio-hg && hg commit -m "<message>" <file1> [<file2> ...] && hg push<br/> #####################################################################<br/> <br/> Regards.<br/> --<br/> Denis<br/> <br/> ------------------------------------------------------------------------------<br/> Android is increasing in popularity, but the open development platform that<br/> developers love is also attractive to malware creators. Download this white<br/> paper to learn more about secure code signing practices that can help keep<br/> Android apps secure.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> TeXstudio-list mailing list<br/> TeX...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/texstudio-list" target="_blank">https://lists.sourceforge.net/lists/listinfo/texstudio-list</a></div> </div> </div> </div></div></body></html> |
From: Denis B. <dbi...@wa...> - 2013-10-31 11:13:56
|
Le jeudi 31/10/13 à 12h07, "Jan Sundermeyer" <sun...@gm...> a écrit : > Hi Denis, Hi Jan, > hg update is not always the best solution. What's the best one, I mean the one to use for everyday check out? > Have you tried. > hg pull && hg merge ? Yes but I get: $ hg pull && hg merge pulling from ssh://den...@hg.../p/texstudio/hg searching for changes no changes found remote: X11 forwarding request failed on channel 0 give up: outstanding uncommitted changes (use 'hg status' to list changes) Thanks. -- Denis |
From: Jan S. <sun...@gm...> - 2013-10-31 11:53:22
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div> <div>maybe you should separate the commands.</div> <div> </div> <div>what happens with hg merge ?</div> <div> </div> <div>what happens if you "hg ci"</div> <div>and then what happens with hg push ?</div> <div> <div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"> <div style="margin:0 0 10px 0;"><b>Gesendet:</b> Donnerstag, 31. Oktober 2013 um 12:13 Uhr<br/> <b>Von:</b> "Denis Bitouzé" <dbi...@wa...><br/> <b>An:</b> tex...@li...<br/> <b>Betreff:</b> Re: [TeXstudio-list] hg update problem</div> <div name="quoted-content">Le jeudi 31/10/13 à 12h07,<br/> "Jan Sundermeyer" <sun...@gm...> a écrit :<br/> <br/> > Hi Denis,<br/> <br/> Hi Jan,<br/> <br/> > hg update is not always the best solution.<br/> <br/> What's the best one, I mean the one to use for everyday check out?<br/> <br/> > Have you tried.<br/> > hg pull && hg merge ?<br/> <br/> Yes but I get:<br/> <br/> $ hg pull && hg merge<br/> pulling from ssh://den...@hg.../p/texstudio/hg<br/> searching for changes<br/> no changes found<br/> remote: X11 forwarding request failed on channel 0<br/> give up: outstanding uncommitted changes<br/> (use 'hg status' to list changes)<br/> <br/> Thanks.<br/> --<br/> Denis<br/> <br/> ------------------------------------------------------------------------------<br/> Android is increasing in popularity, but the open development platform that<br/> developers love is also attractive to malware creators. Download this white<br/> paper to learn more about secure code signing practices that can help keep<br/> Android apps secure.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> TeXstudio-list mailing list<br/> TeX...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/texstudio-list" target="_blank">https://lists.sourceforge.net/lists/listinfo/texstudio-list</a></div> </div> </div> </div></div></body></html> |
From: Denis B. <dbi...@wa...> - 2013-10-31 13:01:18
|
Le jeudi 31/10/13 à 12h53, "Jan Sundermeyer" <sun...@gm...> a écrit : > what happens with hg merge ? $ hg merge give up : outstanding uncommitted changes (use 'hg status' to list changes) > what happens if you "hg ci" It prompts an emacsclient ;) window containing: HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Leave message empty to abort commit. HG: -- HG: user: Denis Bitouzé <dbi...@wa...> HG: branch 'default' HG: changed texstudio_cs.ts HG: changed texstudio_de.ts HG: changed texstudio_es.ts HG: changed texstudio_hu.ts HG: changed texstudio_it.ts HG: changed texstudio_ja.ts HG: changed texstudio_pt_BR.ts HG: changed texstudio_ru.ts HG: changed texstudio_uk.ts HG: changed texstudio_zh_CN.ts and, after I entered "Test" as text and closed the window: $ hg log | less changeset: 4086:83a2e02dedee tag: tip user: Denis Bitouzé <dbi...@wa...> date: Thu Oct 31 13:58:24 2013 +0100 summary: Test. > and then what happens with hg push ? $ hg push pushing to ssh://den...@hg.../p/texstudio/hg searching for changes give up : push creates new remote head 13c05325f458! (did you forget to merge? use push -f to force) remote: X11 forwarding request failed on channel 0 -- Denis |
From: Benito v. d. Z. <be...@be...> - 2013-10-31 13:09:09
|
You should always call hg pull and hg update *before* making any changes. Then after changing, call hg commit, then hg pull, then hg push. If the last hg push fails call hg rebase (requires an enabled rebase extension, otherwise use hg merge) --- It is difficult to fix it if you did not call it in this order. But your log looks good. What does hg heads print? Perhaps you somehow got something like an unnamed branch And the best is to use TortoiseHg, it views the log much better. (and enable the mercurial graphlog extension, to get a more useful output by hg log) On Thu, 31 Oct 2013 14:01:06 +0100, Denis Bitouzé <dbi...@wa...> wrote: > Le jeudi 31/10/13 à 12h53, > "Jan Sundermeyer" <sun...@gm...> a écrit : > >> what happens with hg merge ? > > $ hg merge > give up : outstanding uncommitted changes > (use 'hg status' to list changes) > >> what happens if you "hg ci" > > It prompts an emacsclient ;) window containing: > > HG: Enter commit message. Lines beginning with 'HG:' are removed. > HG: Leave message empty to abort commit. > HG: -- > HG: user: Denis Bitouzé <dbi...@wa...> > HG: branch 'default' > HG: changed texstudio_cs.ts > HG: changed texstudio_de.ts > HG: changed texstudio_es.ts > HG: changed texstudio_hu.ts > HG: changed texstudio_it.ts > HG: changed texstudio_ja.ts > HG: changed texstudio_pt_BR.ts > HG: changed texstudio_ru.ts > HG: changed texstudio_uk.ts > HG: changed texstudio_zh_CN.ts > > and, after I entered "Test" as text and closed the window: > > $ hg log | less > changeset: 4086:83a2e02dedee > tag: tip > user: Denis Bitouzé <dbi...@wa...> > date: Thu Oct 31 13:58:24 2013 +0100 > summary: Test. > >> and then what happens with hg push ? > > $ hg push > pushing to ssh://den...@hg.../p/texstudio/hg > searching for changes > give up : push creates new remote head 13c05325f458! > (did you forget to merge? use push -f to force) > remote: X11 forwarding request failed on channel 0 |
From: Denis B. <dbi...@wa...> - 2013-10-31 13:55:03
|
Le jeudi 31/10/13 à 14h09, Benito van der Zander <be...@be...> a écrit : > You should always call hg pull and hg update *before* making any > changes. That's usually what I did. > Then after changing, call hg commit, then hg pull, then hg push. Also hg pull? Okay, I wasn't aware... > If the last hg push fails call hg rebase (requires an enabled rebase > extension, $ hg rebase nothing to rebase > otherwise use hg merge) $ hg merge tool meld can't handle binary tool meld can't handle binary tool kdiff3 can't handle binary tool vimdiff can't handle binary no tool found to merge texstudio_fr.qm keep (l)ocal or take (o)ther? l merging texstudio_fr.ts /usr/share/meld/meld/meldwindow.py:580: Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed self.notebook.append_page( page.widget, nbl) 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg commit -m "Update French translations" texstudio_fr.ts texstudio_fr.qm give up: cannot partially commit a merge (do not specify files or patterns) > It is difficult to fix it if you did not call it in this order. > > But your log looks good. Okay. > What does hg heads print? $ hg heads changeset: 4086:83a2e02dedee tag: tip user: Denis Bitouzé <dbi...@wa...> date: Thu Oct 31 13:58:24 2013 +0100 summary: Test. changeset: 4083:96522ad237fd branch: stable parent: 4081:d812d8f05660 user: benibela <be...@be...> date: Wed Oct 30 23:49:20 2013 +0100 summary: fix pos1/end keys changeset: 4076:13c05325f458 parent: 4073:21d2dc12c1a6 user: Denis Bitouzé <dbi...@wa...> date: Wed Oct 30 15:15:22 2013 +0100 summary: Update French translations changeset: 4029:144b7f56ef71 branch: cross unix->win user: Tim Hoffmann <tho...@te...> date: Wed Oct 16 19:27:57 2013 +0200 summary: Quick Start: Place cursor between inside document environment > Perhaps you somehow got something like an unnamed branch Indeed, there are no 'branch' in "my" changesets. > And the best is to use TortoiseHg, it views the log much better. > > (and enable the mercurial graphlog extension, to get a more useful > output by hg log) Indeed: I could see that the branch of my commits is 'default'. Thanks! -- Denis |
From: Jan S. <sun...@gm...> - 2013-10-31 14:00:27
|
okay, we are getting close.<br/> do a simple hg ci with no filenames given<br/> <br/> (and then hopefully a push)<br> <br> <div name="quote" style='margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;'> <div style="margin:0 0 10px 0;"> <b>Gesendet:</b> Donnerstag, 31. Oktober 2013 um 14:54 Uhr<br/> <b>Von:</b> "Denis Bitouzé" <dbi...@wa...><br/> <b>An:</b> tex...@li...<br/> <b>Betreff:</b> Re: [TeXstudio-list] hg update problem </div> <div name="quoted-content"> Le jeudi 31/10/13 à 14h09,<br/> Benito van der Zander <be...@be...> a écrit :<br/> <br/> > You should always call hg pull and hg update *before* making any<br/> > changes.<br/> <br/> That's usually what I did.<br/> <br/> > Then after changing, call hg commit, then hg pull, then hg push.<br/> <br/> Also hg pull? Okay, I wasn't aware...<br/> <br/> > If the last hg push fails call hg rebase (requires an enabled rebase<br/> > extension,<br/> <br/> $ hg rebase<br/> nothing to rebase<br/> <br/> > otherwise use hg merge)<br/> <br/> $ hg merge<br/> tool meld can't handle binary<br/> tool meld can't handle binary<br/> tool kdiff3 can't handle binary<br/> tool vimdiff can't handle binary<br/> no tool found to merge texstudio_fr.qm<br/> keep (l)ocal or take (o)ther? l<br/> merging texstudio_fr.ts<br/> /usr/share/meld/meld/meldwindow.py:580: Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed<br/> self.notebook.append_page( page.widget, nbl)<br/> 0 files updated, 2 files merged, 0 files removed, 0 files unresolved<br/> (branch merge, don't forget to commit)<br/> <br/> $ hg commit -m "Update French translations" texstudio_fr.ts texstudio_fr.qm<br/> give up: cannot partially commit a merge (do not specify files or patterns)<br/> <br/> > It is difficult to fix it if you did not call it in this order.<br/> > <br/> > But your log looks good.<br/> <br/> Okay.<br/> <br/> > What does hg heads print?<br/> <br/> $ hg heads<br/> changeset: 4086:83a2e02dedee<br/> tag: tip<br/> user: Denis Bitouzé <dbi...@wa...><br/> date: Thu Oct 31 13:58:24 2013 +0100<br/> summary: Test.<br/> <br/> changeset: 4083:96522ad237fd<br/> branch: stable<br/> parent: 4081:d812d8f05660<br/> user: benibela <be...@be...><br/> date: Wed Oct 30 23:49:20 2013 +0100<br/> summary: fix pos1/end keys<br/> <br/> changeset: 4076:13c05325f458<br/> parent: 4073:21d2dc12c1a6<br/> user: Denis Bitouzé <dbi...@wa...><br/> date: Wed Oct 30 15:15:22 2013 +0100<br/> summary: Update French translations<br/> <br/> changeset: 4029:144b7f56ef71<br/> branch: cross unix->win<br/> user: Tim Hoffmann <tho...@te...><br/> date: Wed Oct 16 19:27:57 2013 +0200<br/> summary: Quick Start: Place cursor between inside document environment<br/> <br/> > Perhaps you somehow got something like an unnamed branch<br/> <br/> Indeed, there are no 'branch' in "my" changesets.<br/> <br/> > And the best is to use TortoiseHg, it views the log much better.<br/> > <br/> > (and enable the mercurial graphlog extension, to get a more useful<br/> > output by hg log)<br/> <br/> Indeed: I could see that the branch of my commits is 'default'.<br/> <br/> Thanks!<br/> -- <br/> Denis<br/> <br/> ------------------------------------------------------------------------------<br/> Android is increasing in popularity, but the open development platform that<br/> developers love is also attractive to malware creators. Download this white<br/> paper to learn more about secure code signing practices that can help keep<br/> Android apps secure.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> TeXstudio-list mailing list<br/> TeX...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/texstudio-list" target="_blank">https://lists.sourceforge.net/lists/listinfo/texstudio-list</a><br/> </div> </div> <br/> |
From: Denis B. <dbi...@wa...> - 2013-10-31 14:15:13
|
Le jeudi 31/10/13 à 15h00, "Jan Sundermeyer" <sun...@gm...> a écrit : > okay, we are getting close. Wow! ;) > do a simple hg ci with no filenames given (and then hopefully a push) $ hg ci -m "Update French translations" nothing changed $ hg push pushing to ssh://den...@hg.../p/texstudio/hg searching for changes give up: push creates new remote head 13c05325f458! (did you forget to merge? use push -f to force) remote: X11 forwarding request failed on channel 0 $ hg merge give up: working directory not at a head revision (use 'hg update' or merge with an explicit revision) $ hg update 10 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge tool meld can't handle binary tool meld can't handle binary tool kdiff3 can't handle binary tool vimdiff can't handle binary no tool found to merge texstudio_fr.qm keep (l)ocal or take (o)ther? o merging texstudio_fr.ts /usr/share/meld/meld/meldwindow.py:580: Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed self.notebook.append_page( page.widget, nbl) 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m "Update French translations" $ hg push pushing to ssh://den...@hg.../p/texstudio/hg searching for changes remote: X11 forwarding request failed on channel 0 remote: adding changesets remote: adding manifests remote: adding file changes remote: added 5 changesets with 26 changes to 12 files remote: <Repository /hg/p/texstudio/hg> refresh queued. I hope I didn't do anything wrong! To summarize, is the following okay for an everyday check out/commits? #################################################################################################### # Check out hg pull && hg update # Translation lupdate texstudio.pro && linguist texstudio_fr.ts # Commit hg commit -m "Update French translations" texstudio_fr.ts texstudio_fr.qm && hg pull && hg push # Clone hg clone ssh://den...@hg.../p/texstudio/hg texstudio-hg #################################################################################################### Thanks! -- Denis |
From: Jan S. <sun...@gm...> - 2013-10-31 15:43:42
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>by the way, instead of hg pull && hg update, you can apply hg pull -u <div> <div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"> <div style="margin:0 0 10px 0;"><b>Gesendet:</b> Donnerstag, 31. Oktober 2013 um 15:15 Uhr<br/> <b>Von:</b> "Denis Bitouzé" <dbi...@wa...><br/> <b>An:</b> tex...@li...<br/> <b>Betreff:</b> Re: [TeXstudio-list] hg update problem</div> <div name="quoted-content">Le jeudi 31/10/13 à 15h00,<br/> "Jan Sundermeyer" <sun...@gm...> a écrit :<br/> <br/> > okay, we are getting close.<br/> <br/> Wow! ;)<br/> <br/> > do a simple hg ci with no filenames given (and then hopefully a push)<br/> <br/> $ hg ci -m "Update French translations"<br/> nothing changed<br/> <br/> $ hg push<br/> pushing to ssh://den...@hg.../p/texstudio/hg<br/> searching for changes<br/> give up: push creates new remote head 13c05325f458!<br/> (did you forget to merge? use push -f to force)<br/> remote: X11 forwarding request failed on channel 0<br/> <br/> $ hg merge<br/> give up: working directory not at a head revision<br/> (use 'hg update' or merge with an explicit revision)<br/> <br/> $ hg update<br/> 10 files updated, 0 files merged, 0 files removed, 0 files unresolved<br/> <br/> $ hg merge<br/> tool meld can't handle binary<br/> tool meld can't handle binary<br/> tool kdiff3 can't handle binary<br/> tool vimdiff can't handle binary<br/> no tool found to merge texstudio_fr.qm<br/> keep (l)ocal or take (o)ther? o<br/> merging texstudio_fr.ts<br/> /usr/share/meld/meld/meldwindow.py:580: Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed<br/> self.notebook.append_page( page.widget, nbl)<br/> 0 files updated, 2 files merged, 0 files removed, 0 files unresolved<br/> (branch merge, don't forget to commit)<br/> <br/> $ hg ci -m "Update French translations"<br/> <br/> $ hg push<br/> pushing to ssh://den...@hg.../p/texstudio/hg<br/> searching for changes<br/> remote: X11 forwarding request failed on channel 0<br/> remote: adding changesets<br/> remote: adding manifests<br/> remote: adding file changes<br/> remote: added 5 changesets with 26 changes to 12 files<br/> remote: <Repository /hg/p/texstudio/hg> refresh queued.<br/> <br/> I hope I didn't do anything wrong!<br/> <br/> To summarize, is the following okay for an everyday check out/commits?<br/> <br/> ####################################################################################################<br/> # Check out<br/> hg pull && hg update<br/> <br/> # Translation<br/> lupdate texstudio.pro && linguist texstudio_fr.ts<br/> <br/> # Commit<br/> hg commit -m "Update French translations" texstudio_fr.ts texstudio_fr.qm && hg pull && hg push<br/> <br/> # Clone<br/> hg clone ssh://den...@hg.../p/texstudio/hg texstudio-hg<br/> ####################################################################################################<br/> <br/> Thanks!<br/> --<br/> Denis<br/> <br/> ------------------------------------------------------------------------------<br/> Android is increasing in popularity, but the open development platform that<br/> developers love is also attractive to malware creators. Download this white<br/> paper to learn more about secure code signing practices that can help keep<br/> Android apps secure.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> TeXstudio-list mailing list<br/> TeX...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/texstudio-list" target="_blank">https://lists.sourceforge.net/lists/listinfo/texstudio-list</a></div> </div> </div> </div></div></body></html> |
From: Denis B. <dbi...@wa...> - 2013-10-31 15:59:12
|
Le jeudi 31/10/13 à 16h43, "Jan Sundermeyer" <sun...@gm...> a écrit : > by the way, instead of hg pull && hg update, you can apply hg pull -u Hence, the following would be okay for an everyday check out/commits? #################################################################################################### # Check out hg pull -u # Translation lupdate texstudio.pro && linguist texstudio_fr.ts # Commit hg ci -m "Update French translations" texstudio_fr.ts texstudio_fr.qm && hg pull -u # Clone hg clone ssh://den...@hg.../p/texstudio/hg texstudio-hg #################################################################################################### BTW, I read here: http://stackoverflow.com/questions/15241394/mercurial-command-to-combine-hg-pull-hg-up that: However, there's a caveat that deserves mentioning: hg pull -u is not exactly equivalent to hg pull && hg update. This is briefly mentioned in the documentation, but it can be surprising if you first run into it; if there's nothing to pull (e.g. no new changesets came in), then hg pull -u doesn't update. This can be slightly confusing if you weren't on a head before issuing the command. -- Denis |
From: Jan S. <sun...@gm...> - 2013-10-31 13:35:30
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>now, after the ci, i would try the merge <div> <div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"> <div style="margin:0 0 10px 0;"><b>Gesendet:</b> Donnerstag, 31. Oktober 2013 um 14:01 Uhr<br/> <b>Von:</b> "Denis Bitouzé" <dbi...@wa...><br/> <b>An:</b> tex...@li...<br/> <b>Betreff:</b> Re: [TeXstudio-list] hg update problem</div> <div name="quoted-content">Le jeudi 31/10/13 à 12h53,<br/> "Jan Sundermeyer" <sun...@gm...> a écrit :<br/> <br/> > what happens with hg merge ?<br/> <br/> $ hg merge<br/> give up : outstanding uncommitted changes<br/> (use 'hg status' to list changes)<br/> <br/> > what happens if you "hg ci"<br/> <br/> It prompts an emacsclient ;) window containing:<br/> <br/> HG: Enter commit message. Lines beginning with 'HG:' are removed.<br/> HG: Leave message empty to abort commit.<br/> HG: --<br/> HG: user: Denis Bitouzé <dbi...@wa...><br/> HG: branch 'default'<br/> HG: changed texstudio_cs.ts<br/> HG: changed texstudio_de.ts<br/> HG: changed texstudio_es.ts<br/> HG: changed texstudio_hu.ts<br/> HG: changed texstudio_it.ts<br/> HG: changed texstudio_ja.ts<br/> HG: changed texstudio_pt_BR.ts<br/> HG: changed texstudio_ru.ts<br/> HG: changed texstudio_uk.ts<br/> HG: changed texstudio_zh_CN.ts<br/> <br/> and, after I entered "Test" as text and closed the window:<br/> <br/> $ hg log | less<br/> changeset: 4086:83a2e02dedee<br/> tag: tip<br/> user: Denis Bitouzé <dbi...@wa...><br/> date: Thu Oct 31 13:58:24 2013 +0100<br/> summary: Test.<br/> <br/> > and then what happens with hg push ?<br/> <br/> $ hg push<br/> pushing to ssh://den...@hg.../p/texstudio/hg<br/> searching for changes<br/> give up : push creates new remote head 13c05325f458!<br/> (did you forget to merge? use push -f to force)<br/> remote: X11 forwarding request failed on channel 0<br/> --<br/> Denis<br/> <br/> ------------------------------------------------------------------------------<br/> Android is increasing in popularity, but the open development platform that<br/> developers love is also attractive to malware creators. Download this white<br/> paper to learn more about secure code signing practices that can help keep<br/> Android apps secure.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> TeXstudio-list mailing list<br/> TeX...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/texstudio-list" target="_blank">https://lists.sourceforge.net/lists/listinfo/texstudio-list</a></div> </div> </div> </div></div></body></html> |
From: Jan S. <sun...@gm...> - 2013-10-31 15:41:16
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>looks good. <div> <div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"> <div style="margin:0 0 10px 0;"><b>Gesendet:</b> Donnerstag, 31. Oktober 2013 um 15:15 Uhr<br/> <b>Von:</b> "Denis Bitouzé" <dbi...@wa...><br/> <b>An:</b> tex...@li...<br/> <b>Betreff:</b> Re: [TeXstudio-list] hg update problem</div> <div name="quoted-content">Le jeudi 31/10/13 à 15h00,<br/> "Jan Sundermeyer" <sun...@gm...> a écrit :<br/> <br/> > okay, we are getting close.<br/> <br/> Wow! ;)<br/> <br/> > do a simple hg ci with no filenames given (and then hopefully a push)<br/> <br/> $ hg ci -m "Update French translations"<br/> nothing changed<br/> <br/> $ hg push<br/> pushing to ssh://den...@hg.../p/texstudio/hg<br/> searching for changes<br/> give up: push creates new remote head 13c05325f458!<br/> (did you forget to merge? use push -f to force)<br/> remote: X11 forwarding request failed on channel 0<br/> <br/> $ hg merge<br/> give up: working directory not at a head revision<br/> (use 'hg update' or merge with an explicit revision)<br/> <br/> $ hg update<br/> 10 files updated, 0 files merged, 0 files removed, 0 files unresolved<br/> <br/> $ hg merge<br/> tool meld can't handle binary<br/> tool meld can't handle binary<br/> tool kdiff3 can't handle binary<br/> tool vimdiff can't handle binary<br/> no tool found to merge texstudio_fr.qm<br/> keep (l)ocal or take (o)ther? o<br/> merging texstudio_fr.ts<br/> /usr/share/meld/meld/meldwindow.py:580: Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed<br/> self.notebook.append_page( page.widget, nbl)<br/> 0 files updated, 2 files merged, 0 files removed, 0 files unresolved<br/> (branch merge, don't forget to commit)<br/> <br/> $ hg ci -m "Update French translations"<br/> <br/> $ hg push<br/> pushing to ssh://den...@hg.../p/texstudio/hg<br/> searching for changes<br/> remote: X11 forwarding request failed on channel 0<br/> remote: adding changesets<br/> remote: adding manifests<br/> remote: adding file changes<br/> remote: added 5 changesets with 26 changes to 12 files<br/> remote: <Repository /hg/p/texstudio/hg> refresh queued.<br/> <br/> I hope I didn't do anything wrong!<br/> <br/> To summarize, is the following okay for an everyday check out/commits?<br/> <br/> ####################################################################################################<br/> # Check out<br/> hg pull && hg update<br/> <br/> # Translation<br/> lupdate texstudio.pro && linguist texstudio_fr.ts<br/> <br/> # Commit<br/> hg commit -m "Update French translations" texstudio_fr.ts texstudio_fr.qm && hg pull && hg push<br/> <br/> # Clone<br/> hg clone ssh://den...@hg.../p/texstudio/hg texstudio-hg<br/> ####################################################################################################<br/> <br/> Thanks!<br/> --<br/> Denis<br/> <br/> ------------------------------------------------------------------------------<br/> Android is increasing in popularity, but the open development platform that<br/> developers love is also attractive to malware creators. Download this white<br/> paper to learn more about secure code signing practices that can help keep<br/> Android apps secure.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> TeXstudio-list mailing list<br/> TeX...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/texstudio-list" target="_blank">https://lists.sourceforge.net/lists/listinfo/texstudio-list</a></div> </div> </div> </div></div></body></html> |
From: Denis B. <dbi...@wa...> - 2013-10-31 15:52:24
|
Le jeudi 31/10/13 à 16h41, "Jan Sundermeyer" <sun...@gm...> a écrit : > looks good. Great! -- Denis |
From: Jan S. <sun...@gm...> - 2013-10-31 16:30:03
|
Hi Denis, maybe i misunderstood, but "hg clone ..." is only needed once, not very day ? and i suppose, you want to do a "hg push" after the commit ... On 31.10.2013 16:59, Denis Bitouzé wrote: > Le jeudi 31/10/13 à 16h43, > "Jan Sundermeyer" <sun...@gm...> a écrit : > >> by the way, instead of hg pull && hg update, you can apply hg pull -u > > Hence, the following would be okay for an everyday check out/commits? > > #################################################################################################### > # Check out > hg pull -u > > # Translation > lupdate texstudio.pro && linguist texstudio_fr.ts > > # Commit > hg ci -m "Update French translations" texstudio_fr.ts texstudio_fr.qm > && hg pull -u > > # Clone > hg clone ssh://den...@hg.../p/texstudio/hg texstudio-hg > #################################################################################################### > > BTW, I read here: > > http://stackoverflow.com/questions/15241394/mercurial-command-to-combine-hg-pull-hg-up > > that: > > However, there's a caveat that deserves mentioning: hg pull -u is not > exactly equivalent to hg pull && hg update. This is briefly mentioned > in the documentation, but it can be surprising if you first run into > it; if there's nothing to pull (e.g. no new changesets came in), then > hg pull -u doesn't update. This can be slightly confusing if you > weren't on a head before issuing the command. > |
From: Denis B. <dbi...@wa...> - 2013-10-31 16:43:40
|
Le jeudi 31/10/13 à 17h29, Jan Sundermeyer <sun...@gm...> a écrit : > Hi Denis, Hi Jan, > maybe i misunderstood, but "hg clone ..." is only needed once, not > very day ? Yes, I should have exclude this line from my message, sorry. > and i suppose, you want to do a "hg push" after the commit ... Yes, sorry again, I meant: hg ci -m "Update French translations" texstudio_fr.ts texstudio_fr.qm && hg pull && hg push -- Denis |