Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n/polib.LICENSE
author Erik Zielke <ez@aragost.com>
Wed, 09 Feb 2011 10:53:09 +0100
changeset 13417 0748e18be470
parent 11387 181936ec9bfb
permissions -rw-r--r--
subrepos: prompt on conflicts on update with dirty subrepos Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11387
181936ec9bfb i18n: import polib 0.5.2 (rev b0ab301cfdcc)
Wagner Bruna <wbruna@yahoo.com>
parents:
diff changeset 
     1
 
copyright (c) 2006-2010 David JEAN LOUIS
181936ec9bfb i18n: import polib 0.5.2 (rev b0ab301cfdcc)
Wagner Bruna <wbruna@yahoo.com>
parents:
diff changeset 
     2
 












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




     3


Permission is hereby granted, free of charge, to any person obtaining a copy












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




     4


of this software and associated documentation files (the "Software"), to deal












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




     5


in the Software without restriction, including without limitation the rights












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




     6


to use, copy, modify, merge, publish, distribute, sublicense, and/or sell












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




     7


copies of the Software, and to permit persons to whom the Software is












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




     8


furnished to do so, subject to the following conditions:












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




     9














181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    10


The above copyright notice and this permission notice shall be included in all












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    11


copies or substantial portions of the Software.












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    12














181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    13


THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    14


IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    15


FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    16


AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    17


LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    18


OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE












181936ec9bfb
i18n: import polib 0.5.2 (rev b0ab301cfdcc)



Wagner Bruna <wbruna@yahoo.com>


parents: 

diff
changeset




    19


SOFTWARE.














mercurial