#28784: Assembling WebRTC sources fails with error "You have unstaged changes"
--------------------------------------+------------------------------
Reporter: gk | Owner: tbb-team
Type: defect | Status: needs_review
Priority: Medium | Milestone:
Component: Applications/Tor Browser | Version:
Severity: Normal | Resolution:
Keywords: tbb-rbm, snowflake | Actual Points:
Parent ID: | Points:
Reviewer: | Sponsor:
--------------------------------------+------------------------------
Changes (by dcf):
* status: new => needs_review
Comment:
I found some helpful options of `gclient sync`:
{{{
$ gclient help sync
-f, --force force update even for unchanged modules
-D, --delete_unversioned_trees
Deletes from the working copy any dependencies
that
have been removed since the last sync, as long as
there are no local modifications. When used with
--force, such dependencies are removed even if
they
have local modifications. When used with --reset,
all
untracked directories are removed from the working
copy, excluding those which are explicitly ignored
in
the repository.
-R, --reset resets any local changes before updating (git
only)
}}}
Adding these three options seems to take care of the gmock and gtest
directories, no matter their current status.
I tested this with a gclient/webrtc that had been manually set up with
branch-heads/58 (`gclient sync --nohooks --no-history --with_branch_heads
-r c279861207c5b15fc51069e96595782350e0ac12`) in order to simulate a
webrtc upgrade, and I also tested after manually deleting
src/testing/gmock and src/testing/gtest.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/28784#comment:4>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs
