merge-test-examples : lp:~racb/git-ubuntu : Git : Code : git-ubuntu

Get this branch:: git clone -b merge-test-examples https://git.launchpad.net/~racb/git-ubuntu

Only Robie Basak can upload to this branch. If you are Robie Basak please log in for upload directions.

Branch merges

Branch information

Name:: merge-test-examples

Repository:: lp:~racb/git-ubuntu

Recent commits

7f9a20b... by Robie Basak on 2021-08-03

Add examples to accompany MP review

See the review at:
https://code.launchpad.net/~bryce/usd-importer/+git/usd-importer/+merge/406335

95177c6... by Bryce Harrington on 2021-07-28

merge: Add code docs

e7cba1b... by Bryce Harrington on 2020-04-15

merge: Add unit test cases for git ubuntu merge

merge.py is a user-interface-layer component that calls into
GitUbuntuRepository and other internal functionality, which already have
their own unit tests. So these test cases focus on ensuring the
internal functionality will be receiving their expected input. This is
done by substituting GitUbuntuRepository with a MockRepo object with a
faked implementation of GitUbuntuRepository's API that lets us verify it
is receiving requests to tag, update-maintainer, etc. as expected.

b7eff11... by Bryce Harrington on 2020-02-15

test_util: Implement create_test_changelog_entry()

This routine creates a single synthetic changelog entry. Each of the
elements of the changelog entry can be overridden via function
parameters, to allow test cases to selectively customize the entry to
suit.

Multiple changelog entries aren't supported. For this, tests will
simply call this routine multiple times and concatenate the results.

c31ede8... by Robie Basak on 2021-07-27

Whitelist Google-related packages for Utkarsh

b15bd6b... by Bryce Harrington on 2021-07-23

Add several packages to the whitelist.

These packages are listed on Merge-o-Matic as having been last modified
by server team members, and so may be ones team members will want to
continue maintaining in git-ubuntu.

9fdb2d4... by Bryce Harrington on 2021-07-19