This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 200859 - Mercurial commit on parent repo dont process changes in subrepo
Summary: Mercurial commit on parent repo dont process changes in subrepo
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: 7.0.1
Hardware: PC Linux
: P3 normal with 4 votes (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on: 225118
Blocks:
  Show dependency tree
 
Reported: 2011-08-11 08:06 UTC by alpaca
Modified: 2013-02-07 00:02 UTC (History)
2 users (show)

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description alpaca 2011-08-11 08:06:57 UTC
Project versioning structure:
/  - master repo
/sub - linked subrepo (via .hgsub)
/sub/somefile - locally changed file

1. commit at /
expected behavior (hg cli behaviour): 
 - recurse subrepo changes, find changed /sub/comefile
 - commit subrepo
 - update .hgsubstate
 - commit master.
actual behavior:
 a) no changes in master repo
   - find no changes, block 'commit' button in dialog
 b) have changes in master repo
   - find only changes in master
   - commit master without recursing subrepo changes

2. push at /
expected behavior:  
 - recurse subrepo, push subrepo changes
actual behavior:
 - ignore subrepo changes

Tried workarounds:
adding [defaults] status = -S diff = -S in local or per-user hgrc does not change situation
Comment 1 Ondrej Vrabec 2011-08-11 09:38:10 UTC
More about subrepositories: http://mercurial.selenic.com/wiki/Subrepository
Nested repositories (less so the Subrepository feature) have never been supported, probably someone could look at it.
To fully support it, all relevant actions (commit, status) must:
1) work recursively on nested *and linked* repositories
2) commit has to group files from nested *and linked* repositories together and commit them at once

About the push, are you sure it does not work recursively? I just tried at it seems to work.
Comment 2 alpaca 2011-08-11 09:58:53 UTC
(In reply to comment #1)
> About the push, are you sure it does not work recursively? I just tried at it
> seems to work.
Yep, my mistake, push works well. Only commit.
Comment 3 styu_ 2012-09-03 14:01:51 UTC
After committing the seubrepository, the ".hgsubrepo" file changes, but Netbeans ignores this file, so I need to commit the master repo with the command line tool after every commit on the subrepository.
Netbeans 7.2, Ubuntu 12.04
Comment 4 styu_ 2012-09-03 14:06:53 UTC
An other issue is when the repositories are password protected, and I am trying to push the master repo, Netbeans continually asks for the username and password (forewer). When pushing only the subrepository, it works without any issue (asks for the password once, and pushes the subrepository without error).
So I have to push the master repository with the command line.
Comment 5 evandelacruz 2013-02-07 00:01:51 UTC
(In reply to comment #3)
> After committing the seubrepository, the ".hgsubrepo" file changes, but
> Netbeans ignores this file, so I need to commit the master repo with the
> command line tool after every commit on the subrepository.
> Netbeans 7.2, Ubuntu 12.04

This is the part that I believe is a bug.  The other
Comment 6 evandelacruz 2013-02-07 00:02:56 UTC
(In reply to comment #5)
> (In reply to comment #3)
> > After committing the seubrepository, the ".hgsubrepo" file changes, but
> > Netbeans ignores this file, so I need to commit the master repo with the
> > command line tool after every commit on the subrepository.
> > Netbeans 7.2, Ubuntu 12.04
> 
> This is the part that I believe is a bug.  The other

This was posted by mistake please disregard.  I just wanted to be added to the cc list.  Ty