~ubuntu-branches/ubuntu/precise/mercurial/precise-updates

« back to all changes in this revision

Viewing changes to tests/test-mq-qrefresh.t

Committer: Bazaar Package Importer
Author(s): Javi Merino
Date: 2011-03-06 16:01:58 UTC
mto: (28.1.2 sid) (1.1.14)
mto: This revision was merged to the branch mainline in revision 32.
Revision ID: james.westby@ubuntu.com-20110306160158-y94pzpmtd7b1xgjk

Tags: upstream-1.8

Import upstream version 1.8

files added:
contrib/win32/buildlocal.bat

mercurial/bookmarks.py

tests/cgienv

tests/filtercr.py

tests/test-i18n.t

tests/test-issue1502.t

tests/test-merge-subrepos.t

tests/test-mq-qpush-exact.t

tests/test-mq-subrepo-svn.t

tests/test-mq-subrepo.t

tests/test-no-symlinks.t

tests/test-pending.t

tests/test-push-cgi.t

tests/test-revset-dirstate-parents.t

tests/test-subrepo-git.t

files removed:
hgext/bookmarks.py

tests/test-hardlinks-safety.t

tests/test-no-symlinks

tests/test-no-symlinks.out

files modified:
.hgignore

.hgsigs

.hgtags

Makefile

PKG-INFO

contrib/bash_completion

contrib/check-code.py

contrib/hgk

contrib/perf.py

contrib/tcsh_completion

contrib/tcsh_completion_build.sh

contrib/wix/dist.wxs

contrib/wix/guids.wxi

contrib/zsh_completion

doc/Makefile

doc/gendoc.py

doc/hg.1

doc/hg.1.html

doc/hgrc.5

doc/hgrc.5.html

doc/hgrc.5.txt

hgext/color.py

hgext/convert/__init__.py

hgext/convert/convcmd.py

hgext/convert/subversion.py

hgext/eol.py

hgext/gpg.py

hgext/hgk.py

hgext/inotify/linux/__init__.py

hgext/keyword.py

hgext/mq.py

hgext/patchbomb.py

hgext/progress.py

hgext/rebase.py

hgext/record.py

hgext/transplant.py

i18n/da.po

i18n/de.po

i18n/ja.po

i18n/polib.py

i18n/pt_BR.po

i18n/sv.po

mercurial/__version__.py

mercurial/archival.py

mercurial/bdiff.c

mercurial/bundlerepo.py

mercurial/changegroup.py

mercurial/cmdutil.py

mercurial/commands.py

mercurial/config.py

mercurial/context.py

mercurial/demandimport.py

mercurial/dirstate.py

mercurial/discovery.py

mercurial/dispatch.py

mercurial/encoding.py

mercurial/error.py

mercurial/extensions.py

mercurial/filelog.py

mercurial/help/patterns.txt

mercurial/help/subrepos.txt

mercurial/help/templates.txt

mercurial/help/urls.txt

mercurial/hg.py

mercurial/hgweb/common.py

mercurial/hgweb/hgweb_mod.py

mercurial/hgweb/hgwebdir_mod.py

mercurial/hgweb/server.py

mercurial/hgweb/webcommands.py

mercurial/hook.py

mercurial/httprepo.py

mercurial/ignore.py

mercurial/localrepo.py

mercurial/lock.py

mercurial/mail.py

mercurial/manifest.py

mercurial/match.py

mercurial/merge.py

mercurial/minirst.py

mercurial/osutil.c

mercurial/parser.py

mercurial/parsers.c

mercurial/patch.py

mercurial/posix.py

mercurial/pure/parsers.py

mercurial/pushkey.py

mercurial/repair.py

mercurial/repo.py

mercurial/revlog.py

mercurial/revset.py

mercurial/sshrepo.py

mercurial/statichttprepo.py

mercurial/store.py

mercurial/subrepo.py

mercurial/tags.py

mercurial/templatekw.py

mercurial/templater.py

mercurial/templates/map-cmdline.default

mercurial/templates/map-cmdline.xml

mercurial/templates/paper/branches.tmpl

mercurial/templates/paper/shortlogentry.tmpl

mercurial/transaction.py

mercurial/ui.py

mercurial/url.py

mercurial/util.py

mercurial/verify.py

mercurial/win32.py

mercurial/windows.py

mercurial/wireproto.py

setup.py

tests/hghave

tests/printenv.py

tests/run-tests.py

tests/test-acl.t

tests/test-alias.t

tests/test-archive.t

tests/test-backout.t

tests/test-bookmarks-current.t

tests/test-bookmarks-pushpull.t

tests/test-bookmarks-rebase.t

tests/test-bookmarks-strip.t

tests/test-bookmarks.t

tests/test-bundle-r.t

tests/test-bundle.t

tests/test-check-code.t

tests/test-clone-cgi.t

tests/test-clone-failure.t

tests/test-command-template.t

tests/test-commit.t

tests/test-confused-revert.t

tests/test-convert-cvs.t

tests/test-convert-svn-move.t

tests/test-convert-svn-source.t

tests/test-convert.t

tests/test-debugcomplete.t

tests/test-demandimport.py

tests/test-demandimport.py.out

tests/test-diff-color.t

tests/test-diffstat.t

tests/test-doctest.py

tests/test-encoding.t

tests/test-eol-hook.t

tests/test-eol.t

tests/test-extension.t

tests/test-filebranch.t

tests/test-fncache.t

tests/test-globalopts.t

tests/test-hardlinks.t

tests/test-help.t

tests/test-hgignore.t

tests/test-hgwebdir.t

tests/test-hook.t

tests/test-http-proxy.t

tests/test-http.t

tests/test-https.t

tests/test-identify.t

tests/test-import.t

tests/test-inherit-mode.t

tests/test-issue619.t

tests/test-keyword.t

tests/test-merge-symlinks.t

tests/test-merge-tools.t

tests/test-merge1.t

tests/test-minirst.py

tests/test-minirst.py.out

tests/test-mq-caches.t

tests/test-mq-qnew.t

tests/test-mq-qpush-fail.t

tests/test-mq-qrefresh.t

tests/test-mq.t

tests/test-newbranch.t

tests/test-newcgi.t

tests/test-newercgi.t

tests/test-notify.t

tests/test-oldcgi.t

tests/test-parentrevspec.t

tests/test-parseindex2.py

tests/test-patchbomb.t

tests/test-progress.t

tests/test-pull-http.t

tests/test-pull-pull-corruption.t

tests/test-pull-r.t

tests/test-pull.t

tests/test-push-http.t

tests/test-push-warn.t

tests/test-qrecord.t

tests/test-record.t

tests/test-rename-after-merge.t

tests/test-rename-merge1.t

tests/test-rollback.t

tests/test-ssh.t

tests/test-static-http.t

tests/test-subrepo-recursion.t

tests/test-subrepo-svn.t

tests/test-subrepo.t

tests/test-tag.t

tests/test-tags.t

tests/test-trusted.py

tests/test-trusted.py.out

tests/test-url-rev.t

tests/test-win32text.t

Show diffs side-by-side

added added

removed removed

tests/test-mq-qrefresh.t

487

488

$ cd ..

489

490

491

Issue2499: refuse to add .hgsub{,state} to a patch

492

493

$ hg init repo-2499

494

$ cd repo-2499

495

$ hg qinit

496

$ hg qnew -m 0 0.diff

497

$ echo a > a

498

$ hg init sub

499

$ cd sub

500

$ echo b > b

501

$ hg ci -Am 0sub

502

adding b

503

$ cd ..

504

505

test when adding

506

$ echo sub = sub > .hgsub

507

$ echo `hg id -i --debug sub` sub > .hgsubstate

508

$ hg add

509

adding .hgsub

510

adding .hgsubstate

511

adding a

512

$ hg qrefresh

513

warning: not adding .hgsub

514

warning: not adding .hgsubstate

515

$ hg qfinish -a

516

$ hg status

517

A .hgsub

518

A .hgsubstate

519

$ hg forget .hgsubstate

520

$ rm .hgsubstate

521

522

add subrepo with a real commit

523

$ hg ci -m 1

524

committing subrepository sub

525

$ hg qnew -m 2 2.diff

526

527

test when modifying

528

$ echo sub2 = sub2 >> .hgsub

529

$ hg qrefresh

530

warning: not refreshing .hgsub

531

$ echo 0000000000000000000000000000000000000000 sub2 >> .hgsubstate

532

$ hg qrefresh

533

warning: not refreshing .hgsub

534

warning: not refreshing .hgsubstate

535

$ hg revert --no-backup .hgsub .hgsubstate

536

537

test when removing

538

$ hg rm .hgsub

539

$ hg rm .hgsubstate

540

$ hg qrefresh

541

warning: not removing .hgsub

542

warning: not removing .hgsubstate

543

$ hg status

544

R .hgsub

545

R .hgsubstate

546

$ hg revert --no-backup .hgsub .hgsubstate

547

548

test when deleting

549

$ rm .hgsub .hgsubstate

550

$ hg qrefresh

551

warning: not removing .hgsub

552

warning: not removing .hgsubstate

553

warning: subrepo spec file .hgsub not found

554

$ hg status

555

! .hgsub

556

! .hgsubstate

557

$ hg cat -r1 .hgsub > .hgsub

558

$ hg revert --no-backup .hgsubstate

559

560

$ cd ..

Older »